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

package/lib/WirelessGateway.js

@@ -62,7 +62,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 = [26,45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521];
+			var otf_devices = [23,26,45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521,531,537];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -214,7 +214,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [26,45,48,78,79,80,81,82,84,88,89,91,101,102,519,520,521];
+		var otf_devices = [23,26,45,48,78,79,80,81,82,84,88,89,91,101,102,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) {
@@ -272,8 +272,8 @@ module.exports = class WirelessSensor{
 						console.log('Total Expected Packets:');
 						console.log(expected_packets);
 						// console.log(current_packet in globalDevices[deviceAddr].data);
-						// console.log(current_packet == 1);
-						// console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+						// console.log(!(((current_packet&127)-1) in globalDevices[deviceAddr].data));
+						// console.log(typeof current_packet in globalDevices[deviceAddr].data);
 						if(this.hasOwnProperty('failure_no')){
 							this.failure_no = this.failure_no + 1;
 						}
@@ -297,6 +297,10 @@ module.exports = class WirelessSensor{
 				if(expected_packets == 1){
 					this.build_101_data(payload, deviceAddr, hour, minute, sdata_start, current_packet, firmware);
 				} else{
+					// console.log('------');
+					// console.log(current_packet);
+					// console.log(expected_packets);
+					// console.log(Object.keys(globalDevices[deviceAddr].data).length);
 					globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
 				}
 
@@ -640,7 +644,7 @@ module.exports = class WirelessSensor{
 					data: payload.slice(8)
 				};
 				// #OTF
-			}else if(parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 515 || parsed.sensor_type == 519){
+			}else if(parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 537){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -1092,6 +1096,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_thermocouple_type_23(sensor_mac, value){
+		console.log('config_set_thermocouple_type_23');
+		let packet = [244, 83, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
@@ -5982,13 +5992,626 @@ function sensor_types(parent){
 			name: 'Custom Noise Sensor',
 			parse: (d) => {
 				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)
+					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),
 				};
 			}
 		},
+		'537': {
+			name: 'Type 537 - Custom Standalone Smart Vibration Sensor',
+			parse: (payload, parsed, mac) => {
+				if(payload[7] >> 1 != 0){
+					console.log('Error found');
+					parsed.data = {error: 'Error found, Sensor Probe may be unattached'};
+					return parsed;
+				}
+
+				if(payload[8] === 1){
+					var deviceAddr = mac;
+					var firmware = payload[1];
+					var hour = payload[11];
+					var minute = payload[12];
+					var expected_packets = payload[15];
+					var current_packet = payload[16];
+					var sdata_start = 17;
+
+					if(globalDevices.hasOwnProperty(deviceAddr) || expected_packets == 1){
+						if(expected_packets != 1){
+							// if a packet is already stored with the same packet ID, or if packet ID is 1, or if current packet ID is not one more than last packet ID
+							if(current_packet in globalDevices[deviceAddr].data || current_packet == 1 || !((current_packet-1) in globalDevices[deviceAddr].data)) {
+								console.log('-----');
+								console.log('bad packet breakdown deleting stream');
+								console.log(current_packet);
+								console.log(expected_packets);
+								console.log(current_packet in globalDevices[deviceAddr].data);
+								console.log(current_packet == 1);
+								console.log(!((current_packet-1) in globalDevices[deviceAddr].data));
+								if(this.hasOwnProperty('failure_no')){
+									this.failure_no = this.failure_no + 1;
+								}
+								else{
+									this.failure_no = 1;
+								}
+								if(this.hasOwnProperty('failure_no')){
+									console.log('####falure no');
+									console.log(this.failure_no);
+								}
+								// console.log(globalDevices[deviceAddr].data);
+								delete globalDevices[deviceAddr];
+								if(current_packet != 1){
+									return;
+								} else{
+
+									var mode = payload[8];
+									var odr = payload[9];
+									var en_axis = payload[10] & 7;
+									var fsr = payload[10] >> 5;
+									var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+									switch(odr){
+										case 6:
+											odr = 50;
+											break;
+										case 7:
+											odr = 100;
+											break;
+										case 8:
+											odr = 200;
+											break;
+										case 9:
+											odr = 400;
+											break;
+										case 10:
+											odr = 800;
+											break;
+										case 11:
+											odr = 1600;
+											break;
+										case 12:
+											odr = 3200;
+											break;
+										case 13:
+											odr = 6400;
+											break;
+										case 14:
+											odr = 12800;
+											break;
+										case 15:
+											odr = 25600;
+											break;
+										default:
+											odr = 0;
+									}
+
+									globalDevices[deviceAddr] = {
+										// stream_size: expected_packets,
+										data: {},
+										odr: odr,
+										mo: mode,
+										en_axis: en_axis,
+										fsr: fsr,
+										hour: hour,
+										minute: minute,
+										device_temp: device_temp,
+									}
+									globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+									return;
+								}
+							}
+							else{
+								globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+							}
+						}
+						else{
+							var mode = payload[8];
+							var odr = payload[9];
+							var en_axis = payload[10] & 7;
+							var fsr = payload[10] >> 5;
+							var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+							switch(odr){
+								case 6:
+									odr = 50;
+									break;
+								case 7:
+									odr = 100;
+									break;
+								case 8:
+									odr = 200;
+									break;
+								case 9:
+									odr = 400;
+									break;
+								case 10:
+									odr = 800;
+									break;
+								case 11:
+									odr = 1600;
+									break;
+								case 12:
+									odr = 3200;
+									break;
+								case 13:
+									odr = 6400;
+									break;
+								case 14:
+									odr = 12800;
+									break;
+								case 15:
+									odr = 25600;
+									break;
+								default:
+									odr = 0;
+							}
+
+							globalDevices[deviceAddr] = {
+								// stream_size: expected_packets,
+								data: {},
+								odr: odr,
+								mo: mode,
+								en_axis: en_axis,
+								fsr: fsr,
+								hour: hour,
+								minute: minute,
+								device_temp: device_temp,
+							}
+							globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						}
+						if(Object.keys(globalDevices[deviceAddr].data).length == expected_packets){
+							var raw_data = new Array();
+							for(const packet in globalDevices[deviceAddr].data){
+								raw_data = raw_data.concat(globalDevices[deviceAddr].data[packet]);
+							}
+							var label = 0;
+
+							var fft = new Array();
+							var fft_concat = {};
+
+							var en_axis_data = {};
+							switch (globalDevices[deviceAddr].en_axis){
+								case 1:
+									en_axis_data.x_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 2:
+									en_axis_data.y_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 3:
+									en_axis_data.x_offset = 0;
+									en_axis_data.y_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 4:
+									en_axis_data.z_offset = 0;
+									en_axis_data.increment = 2;
+									break;
+								case 5:
+									en_axis_data.x_offset = 0;
+									en_axis_data.z_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 6:
+									en_axis_data.y_offset = 0;
+									en_axis_data.z_offset = 2;
+									en_axis_data.increment = 4;
+									break;
+								case 7:
+									en_axis_data.x_offset = 0;
+									en_axis_data.y_offset = 2;
+									en_axis_data.z_offset = 4;
+									en_axis_data.increment = 6;
+									break;
+								default:
+									en_axis_data.increment = 0;
+							}
+
+							var fsr_mult = .00006;
+							var fsr_text = "";
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_mult = 0.00006;
+									break;
+								case 1:
+									fsr_mult = 0.00012;
+									break;
+								case 2:
+									fsr_mult = 0.00024;
+									break;
+								case 3:
+									fsr_mult = 0.00049;
+									break;
+							}
+							switch(globalDevices[deviceAddr].fsr){
+								case 0:
+									fsr_text = "2g";
+									break;
+								case 1:
+									fsr_text = "4g";
+									break;
+								case 2:
+									fsr_text = "8g";
+									break;
+								case 3:
+									fsr_text = "16g";
+									break;
+							}
+
+							for(var i = 0; i < raw_data.length; i+=en_axis_data.increment){
+								label++;
+
+								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));
+								}
+								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));
+								}
+								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));
+								}
+							}
+							var fft_concat_obj = {
+								time_id: globalDevices[deviceAddr].hour +':'+ globalDevices[deviceAddr].minute,
+								mac_address: deviceAddr,
+								en_axis: globalDevices[deviceAddr].en_axis,
+								fsr: fsr_text,
+								odr: globalDevices[deviceAddr].odr,
+								device_temp: globalDevices[deviceAddr].device_temp,
+								data: fft_concat
+							};
+							sensor_data = fft_concat_obj;
+							delete globalDevices[deviceAddr];
+							if(this.hasOwnProperty('failure_no')){
+								console.log('####falure no');
+								console.log(this.failure_no);
+							}
+
+							return sensor_data;
+						}
+						else{
+							return;
+						}
+					}else{
+
+						var mode = payload[8];
+						var odr = payload[9];
+						var en_axis = payload[10] & 7;
+						var fsr = payload[10] >> 5;
+						var device_temp = msbLsb(payload[13], payload[14])/100;
+
+
+						switch(odr){
+							case 6:
+								odr = 50;
+								break;
+							case 7:
+								odr = 100;
+								break;
+							case 8:
+								odr = 200;
+								break;
+							case 9:
+								odr = 400;
+								break;
+							case 10:
+								odr = 800;
+								break;
+							case 11:
+								odr = 1600;
+								break;
+							case 12:
+								odr = 3200;
+								break;
+							case 13:
+								odr = 6400;
+								break;
+							case 14:
+								odr = 12800;
+								break;
+							case 15:
+								odr = 25600;
+								break;
+							default:
+								odr = 0;
+						}
+
+						globalDevices[deviceAddr] = {
+							// stream_size: expected_packets,
+							data: {},
+							odr: odr,
+							mo: mode,
+							en_axis: en_axis,
+							fsr: fsr,
+							hour: hour,
+							minute: minute,
+							device_temp: device_temp,
+						}
+						globalDevices[deviceAddr].data[current_packet] = payload.slice(sdata_start);
+						return;
+					}
+				}
+				else if(payload[8] === 0 || payload[8] === 2){
+					// mode byte most significant bit will indicate fft data.
+					// console.log(d);
+					var odr;
+					switch(payload[9]){
+						case 6:
+							odr = "50Hz"
+							break;
+						case 7:
+							odr = "100Hz";
+							break;
+						case 8:
+							odr = "200Hz";
+							break;
+						case 9:
+							odr = "400Hz";
+							break;
+						case 10:
+							odr = "800Hz";
+							break;
+						case 11:
+							odr = "1600Hz";
+							break;
+						case 12:
+							odr = "3200Hz";
+							break;
+						case 13:
+							odr = "6400Hz";
+							break;
+						case 14:
+							odr = "12800Hz";
+							break;
+						case 15:
+							odr = "25600Hz";
+							break;
+					}
+					return {
+						mode: payload[8],
+
+						odr: odr,
+						temperature: signInt(payload.slice(10, 12).reduce(msbLsb), 16) / 100,
+
+						x_rms_ACC_G: payload.slice(12, 14).reduce(msbLsb)/1000,
+						x_max_ACC_G: payload.slice(14, 16).reduce(msbLsb)/1000,
+						x_velocity_mm_sec: payload.slice(16, 18).reduce(msbLsb) / 100,
+						x_displacement_mm: payload.slice(18, 20).reduce(msbLsb) / 100,
+						x_peak_one_Hz: payload.slice(20, 22).reduce(msbLsb),
+						x_peak_two_Hz: payload.slice(22, 24).reduce(msbLsb),
+						x_peak_three_Hz: payload.slice(24, 26).reduce(msbLsb),
+
+						y_rms_ACC_G: payload.slice(26, 28).reduce(msbLsb)/1000,
+						y_max_ACC_G: payload.slice(28, 30).reduce(msbLsb)/1000,
+						y_velocity_mm_sec: payload.slice(30, 32).reduce(msbLsb) / 100,
+						y_displacement_mm: payload.slice(32, 34).reduce(msbLsb) / 100,
+						y_peak_one_Hz: payload.slice(34, 36).reduce(msbLsb),
+						y_peak_two_Hz: payload.slice(36, 38).reduce(msbLsb),
+						y_peak_three_Hz: payload.slice(38, 40).reduce(msbLsb),
+
+						z_rms_ACC_G: payload.slice(40, 42).reduce(msbLsb)/1000,
+						z_max_ACC_G: payload.slice(42, 44).reduce(msbLsb)/1000,
+						z_velocity_mm_sec: payload.slice(44, 46).reduce(msbLsb) / 100,
+						z_displacement_mm: payload.slice(46, 48).reduce(msbLsb) / 100,
+						z_peak_one_Hz: payload.slice(48, 50).reduce(msbLsb),
+						z_peak_two_Hz: payload.slice(50, 52).reduce(msbLsb),
+						z_peak_three_Hz: payload.slice(52, 54).reduce(msbLsb),
+					};
+				}
+				// else{
+				// 	parsed.data = {'error': 'Vibration mode error'}
+				// 	return parsed;
+				// }
+			},
+			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[16]){
+					case 0:
+						frame_data.mode = "Processed";
+						break;
+					case 1:
+						frame_data.mode = "Raw";
+						break;
+					case 2:
+						frame_data.mode = "Processed + Raw on demand";
+						break;
+				}
+				switch(frame[17]){
+					case 6:
+						frame_data.odr_1 = 50;
+						break;
+					case 7:
+						frame_data.odr_1 = 100;
+						break;
+					case 8:
+						frame_data.odr_1 = 200;
+						break;
+					case 9:
+						frame_data.odr_1 = 400;
+						break;
+					case 10:
+						frame_data.odr_1 = 800;
+						break;
+					case 11:
+						frame_data.odr_1 = 1600;
+						break;
+					case 12:
+						frame_data.odr_1 = 3200;
+						break;
+					case 13:
+						frame_data.odr_1 = 6400;
+						break;
+					case 14:
+						frame_data.odr_1 = 12800;
+						break;
+					case 15:
+						frame_data.odr_1 = 25600;
+						break;
+				}
+				frame_data.sampling_duration_1 = frame[19]*50 + "ms";
+				switch(frame[21]){
+					case 0:
+						frame_data.filter_status = "Disabled";
+						break;
+					case 1:
+						frame_data.filter_status = "Enabled";
+						break;
+				}
+				switch(frame[22]){
+					case 0:
+						frame_data.lpf_coeff_1 = 4;
+						break;
+					case 1:
+						frame_data.lpf_coeff_1 = 8;
+						break;
+					case 2:
+						frame_data.lpf_coeff_1 = 16;
+						break;
+					case 2:
+						frame_data.lpf_coeff_1 = 32;
+						break;
+					case 4:
+						frame_data.lpf_coeff_1 = 64;
+						break;
+					case 5:
+						frame_data.lpf_coeff_1 = 128;
+						break;
+					case 6:
+						frame_data.lpf_coeff_1 = 256;
+						break;
+					case 7:
+						frame_data.lpf_coeff_1 = 512;
+						break;
+					case 8:
+						frame_data.lpf_coeff_1 = 1024;
+						break;
+					case 9:
+						frame_data.lpf_coeff_1 = 2048;
+						break;
+				}
+				frame_data.lpf_freq_1 = frame_data.odr_1 / frame_data.lpf_coeff_1;
+				switch(frame[24]){
+					case 0:
+						frame_data.hpf_coeff_1 = 4;
+						break;
+					case 1:
+						frame_data.hpf_coeff_1 = 8;
+						break;
+					case 2:
+						frame_data.hpf_coeff_1 = 16;
+						break;
+					case 2:
+						frame_data.hpf_coeff_1 = 32;
+						break;
+					case 4:
+						frame_data.hpf_coeff_1 = 64;
+						break;
+					case 5:
+						frame_data.hpf_coeff_1 = 128;
+						break;
+					case 6:
+						frame_data.hpf_coeff_1 = 256;
+						break;
+					case 7:
+						frame_data.hpf_coeff_1 = 512;
+						break;
+					case 8:
+						frame_data.hpf_coeff_1 = 1024;
+						break;
+					case 9:
+						frame_data.hpf_coeff_1 = 2048;
+						break;
+				}
+				frame_data.hpf_freq_1 = frame_data.odr_1 / frame_data.hpf_coeff_1;
+				switch(frame[26]){
+					case 0:
+						frame_data.sampling_interval = "5 Minutes";
+						break;
+					case 1:
+						frame_data.sampling_interval = "10 Minutes";
+						break;
+					case 2:
+						frame_data.sampling_interval = "15 Minutes";
+						break;
+					case 2:
+						frame_data.sampling_interval = "20 Minutes";
+						break;
+					case 4:
+						frame_data.sampling_interval = "30 Minutes";
+						break;
+					case 5:
+						frame_data.sampling_interval = "60 Minutes";
+						break;
+					case 6:
+						frame_data.sampling_interval = "120 Minutes";
+						break;
+					case 7:
+						frame_data.sampling_interval = "180 Minutes";
+						break;
+					case 8:
+						frame_data.sampling_interval = "1 Minute";
+						break;
+				}
+				frame_data.on_request_timeout = frame[27] + " Seconds";
+				frame_data.deadband = frame[28] + "mg";
+
+				switch(frame[29]){
+					case 0:
+						frame_data.payload_length = "50 Bytes";
+						break;
+					case 1:
+						frame_data.payload_length = "100 Bytes";
+						break;
+					case 2:
+						frame_data.payload_length = "150 Bytes";
+						break;
+					case 3:
+						frame_data.payload_length = "180 Bytes";
+						break;
+				}
+
+				return {
+					'firmware': frame[2],
+					'destination_address': toMac(frame.slice(12, 16)),
+					'mode': frame_data.mode,
+					'odr_1': frame_data.odr_1+'Hz',
+					'sampling_duration_1': frame_data.sampling_duration_1,
+					'sampling_duration_2': frame_data.sampling_duration_2,
+					'filter_status': frame_data.filter_status,
+					'lpf_coeff_1': frame_data.lpf_coeff_1,
+					'lpf_freq_1': frame_data.lpf_freq_1+'Hz',
+					'hpf_coeff_1': frame_data.hpf_coeff_1,
+					'hpf_freq_1': frame_data.hpf_freq_1+'Hz',
+					'sampling_interval': frame_data.sampling_interval,
+					'on_request_timeout': frame_data.on_request_timeout,
+					'deadband': frame_data.deadband,
+					'payload_length': frame_data.payload_length,
+					'machine_values': {
+						'firmware': frame[2],
+						'destination_address': toMac(frame.slice(12, 16), false),
+						'mode': frame[16],
+						'odr_1': frame[17],
+						'sampling_duration_1': frame[19],
+						'sampling_duration_2': frame[20],
+						'filter_status': frame[21],
+						'lpf_coeff_1': frame[22],
+						'hpf_coeff_1': frame[24],
+						'sampling_interval': frame[26],
+						'on_request_timeout': frame[27],
+						'deadband': frame[28],
+						'payload_length': frame[29]
+					}
+				}
+			}
+		},
 		'10000': {
 			name: '4-Relay',
 			parse: (d) => {

package/package.json

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

package/wireless.html

@@ -337,6 +337,9 @@
 			mid_calibration_420ma:{value: 68724, validate: NCD_validators.number_range(0, 4294967295)},
 			high_calibration_420ma_active:{value:""},
 			high_calibration_420ma:{value: 68714, validate: NCD_validators.number_range(0, 4294967295)},
+
+			thermocouple_type_23_active:{value:""},
+			thermocouple_type_23:{value: 0},
 		},
 		inputs: 0,
 		outputs: 1,
@@ -440,6 +443,7 @@
 					"521": "521 - Custom 3 Channel Light Sensor",
 					"524": "524 - SDI Multi Soil Probe",
 					"531": "531 - Custom Noise Sensor",
+					"537": "537 - Custom Standalone Smart Vibration Sensor",
 					"10000": "10000 - 4-Channel Relay",
 					"10006": "10006 - 4-Channel 4-20 mA Input",
 					"10007": "10007 - 4-Channel Current Monitor",
@@ -689,6 +693,7 @@
 			<option value="521">521 - Custom 3 Channel Light Sensor</option>
 			<option value="524">524 - SDI Multi Soil Probe</option>
 			<option value="531">531 - Custom Noise Sensor</option>
+			<option value="537">537 - Custom Standalone Smart Vibration Sensor</option>
 			<option value="10000">10000 - 4-Channel Relay</option>
 			<option value="10006">10006 - 4-Channel 4-20 mA Input</option>
 			<option value="10007">10007 - 4-Channel Current Monitor</option>
@@ -702,7 +707,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-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>
+			<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>
 				<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">
@@ -1032,7 +1037,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-84 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-84 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>LED Alert Mode</strong>
@@ -1094,7 +1099,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Mode</strong>
@@ -1138,7 +1143,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-80 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-102 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-102 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Set Sampling Duration 1= 50msec, 2= 100msec</strong>
@@ -1153,7 +1158,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-102 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-102 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Sampling Interval</strong>
@@ -1254,7 +1259,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-80 data-sensor-82 data-sensor-84 data-sensor-102 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-82 data-sensor-84 data-sensor-102 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Output Data Rate</strong>
@@ -1305,7 +1310,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519 data-sensor-537>
 				<div class="form-row ncd-active-check">
 					<strong>Set Filtering</strong>
 					<div>
@@ -1432,7 +1437,7 @@
 				</div>
 			</div>
 
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519 data-sensor-537>
 				<div class="form-row ncd-active-check">
 					<strong>Full Scale Range</strong>
 					<div>
@@ -1469,7 +1474,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-101 data-sensor-519 data-sensor-537>
 				<div class="form-row ncd-active-check">
 					<strong>Set Dead Band in mg</strong>
 					<div>
@@ -1683,7 +1688,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519>
+			<div class="ncd-dependent" data-sensor-80 data-sensor-81 data-sensor-82 data-sensor-84 data-sensor-519 data-sensor-537>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Payload Length</strong>
@@ -1702,6 +1707,29 @@
 					</div>
 				</div>
 			</div>
+			<div class="ncd-dependent" data-sensor-23>
+				<hr>
+				<div class="form-row ncd-active-check">
+					<strong>Thermocouple Type</strong>
+					<div>
+						<label for="node-input-thermocouple_type_23_active">Active:</label>
+						<input type="checkbox" id="node-input-thermocouple_type_23_active" class="ncd-config-toggle" data-target-id="node-input-thermocouple_type_23" value="1">
+					</div>
+					<div>
+						<label for="node-input-thermocouple_type_23"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-thermocouple_type_23">
+							<option selected="selected" value="0">K </option>
+							<option value="16">J Type</option>
+							<option value="32">T Type</option>
+							<option value="48">N Type</option>
+							<option value="64">S Type</option>
+							<option value="80">E Type</option>
+							<option value="96">B Type</option>
+							<option value="112">R Type</option>
+						</select>
+					</div>
+				</div>
+			</div>
 			<div class="ncd-dependent" data-sensor-46>
 				<hr>
 				<div class="form-row ncd-active-check">

package/wireless.js

@@ -315,7 +315,7 @@ module.exports = function(RED) {
 				setTimeout(() => {
 					var tout = setTimeout(() => {
 						node.status(modes.PGM_ERR);
-						node.send({topic: 'Config Results', payload: success, time: Date.now()});
+						node.send({topic: 'Config Results', payload: success, time: Date.now(), addr: sensor.mac});
 					}, 60000);
 					node.status(modes.PGM_NOW);
 					if(parseInt(config.sensor_type) >= 10000){
@@ -432,6 +432,10 @@ module.exports = function(RED) {
 									promises.high_calibration_420ma = node.config_gateway.config_set_high_calibration_420ma(mac, parseInt(config.high_calibration_420ma));
 								}
 								break;
+							case 23:
+								if(config.thermocouple_type_23_active){
+									promises.thermocouple_type_23 = node.config_gateway.config_set_thermocouple_type_23(mac, parseInt(config.thermocouple_type_23));
+								}
 							case 24:
 								if(config.impact_accel_active){
 									promises.impact_accel = node.config_gateway.config_set_acceleration_range_24(mac, parseInt(config.impact_accel));
@@ -894,6 +898,62 @@ module.exports = function(RED) {
 									promises.set_rtc_101 = node.config_gateway.config_set_rtc_101(mac);
 								}
 								break;
+							case 537:
+								if(config.output_data_rate_101_active){
+									promises.output_data_rate_101 = node.config_gateway.config_set_output_data_rate_101(mac, parseInt(config.output_data_rate_101));
+								}
+								if(config.sampling_duration_101_active){
+									promises.sampling_duration_101 = node.config_gateway.config_set_sampling_duration_101(mac, parseInt(config.sampling_duration_101));
+								}
+								if(config.x_axis_101 || config.y_axis_101 || config.z_axis_101){
+									promises.axis_enabled_101 = node.config_gateway.config_set_axis_enabled_101(mac, config.x_axis_101, config.y_axis_101, config.z_axis_101);
+								}
+								if(config.sampling_interval_101_active){
+									promises.sampling_interval_101 = node.config_gateway.config_set_sampling_interval_101(mac, parseInt(config.sampling_interval_101));
+								}
+								if(config.full_scale_range_101_active){
+									promises.full_scale_range_101 = node.config_gateway.config_set_full_scale_range_101(mac, parseInt(config.full_scale_range_101));
+								}
+								if(config.mode_80_active){
+									promises.mode = node.config_gateway.config_set_operation_mode_80(mac, parseInt(config.mode_80));
+								}
+								if(config.filter_80_active){
+									promises.filter = node.config_gateway.config_set_filters_80(mac, parseInt(config.filter_80));
+								}
+								if(config.low_pass_filter_80_active){
+									promises.low_pass_filter = node.config_gateway.config_set_low_pass_filter_80(mac, parseInt(config.low_pass_filter_80));
+								}
+								if(config.high_pass_filter_80_active){
+									promises.high_pass_filter = node.config_gateway.config_set_high_pass_filter_80(mac, parseInt(config.high_pass_filter_80));
+								}
+								if(config.measurement_mode_80_active){
+									promises.measurement_mode = node.config_gateway.config_set_measurement_mode_80(mac, parseInt(config.measurement_mode_80));
+								}
+								if(config.on_request_timeout_80_active){
+									promises.on_request_timeout = node.config_gateway.config_set_filters_80(mac, parseInt(config.on_request_timeout_80));
+								}
+								if(config.deadband_80_active){
+									promises.deadband = node.config_gateway.config_set_deadband_80(mac, parseInt(config.deadband_80));
+								}
+								if(config.led_alert_mode_84_active){
+									promises.led_alert_mode_84 = node.config_gateway.config_set_led_alert_mode_84(mac, parseInt(config.led_alert_mode_84));
+								}
+								if(config.led_accelerometer_threshold_84_active){
+									promises.led_accelerometer_threshold_84 = node.config_gateway.config_set_led_accelerometer_threshold_84(mac, parseInt(config.led_accelerometer_threshold_84));
+								}
+								if(config.led_velocity_threshold_84_active){
+									promises.led_velocity_threshold_84 = node.config_gateway.config_set_led_velocity_threshold_84(mac, parseInt(config.led_velocity_threshold_84));
+								}
+								if(config.acceleration_interrupt_threshold_84_active){
+									promises.acceleration_interrupt_threshold_84 = node.config_gateway.config_set_acceleration_interrupt_threshold_84(mac, parseInt(config.acceleration_interrupt_threshold_84));
+								}
+								if(config.payload_length_80_active){
+									promises.payload_length_80 = node.config_gateway.config_set_payload_length_80(mac, parseInt(config.payload_length_80));
+								}
+								if(config.set_rtc_101){
+									promises.set_rtc_101 = node.config_gateway.config_set_rtc_101(mac);
+								}
+								break;
 						}
 					}
 					// These sensors listed in original_otf_devices use a different OTF code.
@@ -925,7 +985,7 @@ module.exports = function(RED) {
 								if(name != 'finish') success[name] = true;
 								else{
 									// #OTF
-									node.send({topic: 'Config Results', payload: success, time: Date.now()});
+									node.send({topic: 'Config Results', payload: success, time: Date.now(), addr: mac});
 									top_fulfill(success);
 								}
 							}).catch((err) => {