@ncd-io/node-red-enterprise-sensors 1.0.8 → 1.0.9

package/lib/WirelessGateway.js

@@ -1211,9 +1211,9 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_clear_timers_108(sensor_mac){
+	config_set_clear_timers_108(sensor_mac, value){
 		console.log('config_clear_timers_108');
-		var packet = [244, 36, 0, 0, 0, 7];
+		var packet = [244, 36, 0, 0, 0, value];
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -1255,6 +1255,45 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_qos_108(sensor_mac, value){
+		console.log('config_set_qos_108');
+		var packet = [247, 52, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_deactivate_activate_accelero_108(sensor_mac, value){
+		console.log('config_set_deactivate_activate_accelero_108');
+		var packet = [244, 37, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reset_timeout_108(sensor_mac, value){
+		console.log('config_set_deactivate_activate_accelero_108');
+		var packet = [244, 49, 0, 0, 0];
+		let timeout = int2Bytes((value), 2);
+		packet.push(...timeout);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reset_mode_to_disabled_108(sensor_mac, value){
+		console.log('config_set_reset_mode_to_disabled_108');
+		var packet = [244, 51, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtc_108(sensor_mac){
+		console.log('config_set_rtc_108');
+		var date = new Date();
+		var packet = [244, 53, 0, 0, 0, date.getHours(), date.getMinutes(), date.getSeconds()];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_rtc_interval_108(sensor_mac, value){
+		console.log('config_set_rtc_interval_108');
+		var packet = [244, 55, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_sensor_boot_time_420ma(sensor_mac, value){
 		console.log('sensor_boot_time_420ma');
 		var packet = [244, 68, 0, 0, 45, value];
@@ -1425,11 +1464,11 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
-	config_set_auto_raw_destination_110(sensor_mac, value){
+	config_set_auto_raw_destination_110(sensor_mac, modem_mac){
 		console.log('config_set_auto_raw_destination_110');
 		var packet = [244, 79, 0, 0, 80, 72];
-		let value_dest = int2Bytes((value), 4);
-		packet.push(...value_dest);
+		let bytes = int2Bytes((modem_mac), 4);
+		packet.push(...bytes);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
@@ -2328,11 +2367,11 @@ function sensor_types(parent){
 			}
 		},
 		'19': {
-			name: '2-channel 24-bit Current Monitor',
+			name: '2-Channel Current Monitor',
 			parse: (d) => {
 				return {
 					channel_1: d.slice(0, 3).reduce(msbLsb),
-					channel_2: d.slice(4, 7).reduce(msbLsb),
+					channel_2: d.slice(4, 7).reduce(msbLsb)
 				};
 			}
 		},
@@ -2416,7 +2455,7 @@ function sensor_types(parent){
 			}
 		},
 		'28': {
-			'name': '24-Bit 3-Channel Current Monitor',
+			'name': '3-Phase Current Sensor',
 			parse: (d) => {
 				return {
 					channel_1: d.slice(0, 3).reduce(msbLsb),
@@ -3639,7 +3678,6 @@ function sensor_types(parent){
 					'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',
@@ -3659,7 +3697,6 @@ function sensor_types(parent){
 					'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],
@@ -4447,6 +4484,10 @@ function sensor_types(parent){
 					'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',
+					'lpf_coeff_2': frame_data.lpf_coeff_2,
+					'lpf_freq_2': frame_data.lpf_freq_2+'Hz',
+					'hpf_coeff_2': frame_data.hpf_coeff_2,
+					'hpf_freq_2': frame_data.hpf_freq_2+'Hz',
 					'sampling_interval': frame_data.sampling_interval,
 					'on_request_timeout': frame_data.on_request_timeout,
 					'deadband': frame_data.deadband,
@@ -4465,7 +4506,9 @@ function sensor_types(parent){
 					'sampling_duration_2': frame[20],
 					'filter_status': frame[21],
 					'lpf_coeff_1': frame[22],
+					'lpf_coeff_2': frame[23],
 					'hpf_coeff_1': frame[24],
+					'hpf_coeff_2': frame[25],
 					'sampling_interval': frame[26],
 					'on_request_timeout': frame[27],
 					'deadband': frame[28],
@@ -5066,7 +5109,6 @@ function sensor_types(parent){
 					'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',
@@ -5082,7 +5124,6 @@ function sensor_types(parent){
 						'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],
@@ -5677,7 +5718,6 @@ function sensor_types(parent){
 					'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',
@@ -5697,7 +5737,6 @@ function sensor_types(parent){
 					'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],
@@ -5720,6 +5759,44 @@ function sensor_types(parent){
 					ma: d.slice(2, 4).reduce(msbLsb) / 100,
 					db: d.slice(4, 6).reduce(msbLsb) / 100
 				};
+			},
+			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[16]){
+					case 0:
+						frame_data.fsr = "+-0.256 V";
+					break;
+					case 1:
+						frame_data.fsr = "+-0.512 V";
+					break;
+					case 2:
+						frame_data.fsr = "+-1.024 V";
+					break;
+					case 3:
+						frame_data.fsr = "+-2.048 V";
+					break;
+					case 4:
+						frame_data.fsr = "+-4.096 V";
+					break;
+					case 5:
+						frame_data.fsr = "+-6.144 V";
+					break;
+				}
+				return {
+					'firmware': frame[2],
+					'report_rate': frame.slice(12, 16).reduce(msbLsb),
+					'fsr':frame_data.fsr,
+					'boot_up_time': frame[17],
+					'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16),
+						'fsr':frame[16],
+						'boot_up_time': frame[17],
+						'adc_pin_reading': frame.slice(18, 20),
+						'frame': frame
+					}
+				}
 			}
 		},
 		'89': {
@@ -5733,6 +5810,44 @@ function sensor_types(parent){
 					c2_ma: d.slice(8, 10).reduce(msbLsb) / 100,
 					c2_db: d.slice(10, 12).reduce(msbLsb) / 100
 				};
+			},
+			'parse_fly': (frame) => {
+				let frame_data = {};
+				switch(frame[16]){
+					case 0:
+						frame_data.fsr = "+-0.256 V";
+					break;
+					case 1:
+						frame_data.fsr = "+-0.512 V";
+					break;
+					case 2:
+						frame_data.fsr = "+-1.024 V";
+					break;
+					case 3:
+						frame_data.fsr = "+-2.048 V";
+					break;
+					case 4:
+						frame_data.fsr = "+-4.096 V";
+					break;
+					case 5:
+						frame_data.fsr = "+-6.144 V";
+					break;
+				}
+				return {
+					'firmware': frame[2],
+					'report_rate': frame.slice(12, 16).reduce(msbLsb),
+					'fsr':frame_data.fsr,
+					'boot_up_time': frame[17],
+					'adc_pin_reading': frame.slice(18, 20).reduce(msbLsb),
+					'machine_values': {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16),
+						'fsr':frame[16],
+						'boot_up_time': frame[17],
+						'adc_pin_reading': frame.slice(18, 20),
+						'frame': frame
+					}
+				}
 			}
 		},
 		'90': {
@@ -5835,25 +5950,78 @@ function sensor_types(parent){
 		'108': {
 			name: 'Machine Uptime Monitoring Sensor',
 			parse: (d, payload) => {
+				let firmware = payload[1];
 				if(payload[7] & 2 != 0){
 					console.log('Error found');
 					// parsed.data = {error: 'Error found, Acclerometer Probe may be unattached'};
 					let error = {error: 'Error found, Acclerometer Probe may be unattached'};
 					return error;
 				}
+				if(firmware > 5){
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0,
+						report_type: d[41],
+						rtc: [
+							String(d[42]).padStart(2, '0'),
+							String(d[43]).padStart(2, '0'),
+							String(d[44]).padStart(2, '0')
+						].join(':')
+					};
+				}else{
+					return {
+						digital_input_counter: d.slice(0, 4).reduce(msbLsb),
+						digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
+						ct_input_counter: d.slice(8, 12).reduce(msbLsb),
+						ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
+						opto_input_counter: d.slice(16, 20).reduce(msbLsb),
+						opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
+						accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
+						accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
+						magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
+						magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+						input_di: d[40] & 1 ? 1 : 0,
+						input_ct: d[40] & 2 ? 1 : 0,
+						input_opto: d[40] & 4 ? 1 : 0,
+						input_acc: d[40] & 8 ? 1 : 0,
+						input_mag: d[40] & 16 ? 1 : 0
+					};
+				}
+			},
+			'parse_fly': (frame) => {
 				return {
-					digital_input_counter: d.slice(0, 4).reduce(msbLsb),
-					digital_input_uptime: d.slice(4, 8).reduce(msbLsb),
-					ct_input_counter: d.slice(8, 12).reduce(msbLsb),
-					ct_input_uptime: d.slice(12, 16).reduce(msbLsb),
-					opto_input_counter: d.slice(16, 20).reduce(msbLsb),
-					opto_input_uptime: d.slice(20, 24).reduce(msbLsb),
-					accelerometer_counter: d.slice(24, 28).reduce(msbLsb),
-					accelerometer_uptime: d.slice(28, 32).reduce(msbLsb),
-					magnetometer_counter: d.slice(32, 36).reduce(msbLsb),
-					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
-					io_states: d[40]
-				};
+					'firmware': frame[2],
+					'report_rate': frame.slice(12, 16).reduce(msbLsb).toString() + "sec.",
+					'accelerometer_threshold': (frame[16]* 32).toString() + "mg.",
+					'debouncing_timeout': frame[17].toString() + "sec.",
+					'accelero_active_state': frame[18],
+					'digital_inputs_active_edge': frame.slice(19, 22).reduce(msbLsb),
+					'counter_threshold': frame.slice(22, 26).reduce(msbLsb).toString() + "sec.",
+					'trasnmit_on_change_status': frame[26],
+					'machine_values': {
+						'firmware': frame[2],
+						'report_rate': frame.slice(12, 16),
+						'accelerometer_threshold': frame[16],
+						'debouncing_timeout': frame[17],
+						'accelero_active_state': frame[18],
+						'digital_inputs_active_edge': frame.slice(19, 22),
+						'counter_threshold': frame.slice(22, 26),
+						'trasnmit_on_change_status': frame[26]
+					}
+				}
 			}
 		},
 		'110': {
@@ -6194,7 +6362,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else if(payload[8] === 0 || payload[8] === 2){
+				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -6439,7 +6607,6 @@ function sensor_types(parent){
 					'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',
@@ -6455,7 +6622,6 @@ function sensor_types(parent){
 						'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],
@@ -6819,7 +6985,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else if(payload[8] === 0 || payload[8] === 2){
+				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr1;
@@ -7611,7 +7777,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else if(payload[8] === 0 || payload[8] === 2){
+				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -7857,7 +8023,6 @@ function sensor_types(parent){
 					'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',
@@ -7873,7 +8038,6 @@ function sensor_types(parent){
 						'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],
@@ -8222,7 +8386,7 @@ function sensor_types(parent){
 						return;
 					}
 				}
-				else if(payload[8] === 0 || payload[8] === 2){
+				else if(payload[8] === 0 || payload[8] === 2 || payload[8] === 3){
 					// mode byte most significant bit will indicate fft data.
 					// console.log(d);
 					var odr;
@@ -8467,7 +8631,6 @@ function sensor_types(parent){
 					'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',
@@ -8483,7 +8646,6 @@ function sensor_types(parent){
 						'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],
@@ -8500,25 +8662,19 @@ function sensor_types(parent){
 			name: 'C1D2 One Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
 				return parent.sensor_types[80].parse(payload, parsed, mac);
-			}
-		},
-		'181': {
-			name: 'C1D2 Two Channel Vibration Plus',
-			parse: (payload, parsed, mac) => {
-				return parent.sensor_types[81].parse(payload, parsed, mac);
-			}
-		},
-		'180': {
-			name: 'C1D2 One Channel Vibration Plus',
-			parse: (payload, parsed, mac) => {
-				return parent.sensor_types[80].parse(payload, parsed, mac);
-			}
+			},
+			parse_fly: (payload, parsed, mac) => {
+				return parent.sensor_types[80].parse_fly(payload, parsed, mac);
+			},
 		},
 		'181': {
 			name: 'C1D2 Two Channel Vibration Plus',
 			parse: (payload, parsed, mac) => {
 				return parent.sensor_types[81].parse(payload, parsed, mac);
-			}
+			},
+			parse_fly: (payload, parsed, mac) => {
+				return parent.sensor_types[81].parse_fly(payload, parsed, mac);
+			},
 		},
 		'200': {
 			name: '4-20mA Pass Through',
@@ -8536,7 +8692,6 @@ function sensor_types(parent){
 				};
 			}
 		},
-
 		'202': {
 			name: 'Wireless Weather Station',
 			parse: (d) => {
@@ -8550,6 +8705,17 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'217': {
+			name: 'Wireless Weight Scale',
+			parse: (d) => {
+				let units;
+				d[0] ? units = "Kg" : units = "Lbs"
+				return {
+					unit: units,
+					weight: signInt(d.slice(1, 4).reduce(msbLsb)) * 100
+				};
+			}
+		},
 		'502': {
 			name: 'Custom Environmental Sensor',
 			parse: (d, full) => {
@@ -9360,7 +9526,6 @@ function sensor_types(parent){
 					'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',
@@ -9376,7 +9541,6 @@ function sensor_types(parent){
 						'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],
@@ -10244,7 +10408,6 @@ function sensor_types(parent){
 					'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',
@@ -10260,7 +10423,6 @@ function sensor_types(parent){
 						'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],
@@ -10855,7 +11017,6 @@ function sensor_types(parent){
 					'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',
@@ -10871,7 +11032,6 @@ function sensor_types(parent){
 						'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],

package/package.json

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

package/wireless.html

@@ -133,12 +133,12 @@
 	NCD_validators = {
 		number_range: function(l, h, base, property_name = false){
 			if(!base) base = 10;
-			if(property_name === 'on_request_timeout_80'){
+			if(property_name === 'smart_threshold_110'){
 				return function(v){
 					var int = parseInt(v, base);
-					if(this.on_request_timeout_80 == 0){
-						console.log('ERROR: Invalid property detect. Setting on_request_timeout_80 to default value');
-						$("#node-input-on_request_timeout_80").val(1);
+					if(this.smart_threshold_110 == 0){
+						console.log('ERROR: Invalid property detect. Setting smart_threshold_110 to default value');
+						$("#node-input-smart_threshold_110").val(1);
 						return true;
 					} else if(v == undefined){
 						return true;
@@ -376,7 +376,9 @@
 			accelerometer_state_108:{value:0},
 			accelerometer_state_108_active:{value:""},
 
-			clear_all_counters_108:{value:0},
+			clear_timers_108_active:{value:""},
+			clear_timers_108:{value:7},
+
 			accelerometer_threshold_108:{value:10, validate: NCD_validators.number_range(0, 255)},
 			accelerometer_threshold_108_active:{value:""},
 			debounce_time_108:{value:10, validate: NCD_validators.number_range(0, 255)},
@@ -492,7 +494,7 @@
 			smart_interval_110: {value: 0, validate: NCD_validators.number_range(0, 255)},
 
 			smart_threshold_110_active:{value:""},
-			smart_threshold_110: {value: 1, validate: NCD_validators.number_range(1, 65534)},
+			smart_threshold_110: {value: 1, validate: NCD_validators.number_range(1, 65534, 10, "smart_threshold_110")},
 
 			rx485_timeout_1011_active:{value:""},
 			rx485_timeout_1011:{value: 0, validate: NCD_validators.number_range(0, 255)},
@@ -516,6 +518,8 @@
 			push_notification_33_active:{value: ""},
 			push_notification_33:{value: 0},
 			clear_counter_33:{value:0},
+			input_two_33:{value:1},
+			input_two_33_active:{value:""},
 
 			stop_bit_1011_active:{value: ""},
 			stop_bit_1011:{value:0},
@@ -535,7 +539,19 @@
 			sps_skip_samples_32:{value: 1, validate: NCD_validators.number_range(1, 10)},
 
 			sampling_interval_110_active:{value: ""},
-			sampling_interval_110: {value: 1, validate: NCD_validators.number_range(0, 8)}
+			sampling_interval_110: {value: 1, validate: NCD_validators.number_range(0, 8)},
+
+			qos_108_active:{value: ""},
+			qos_108: {value: 0},
+			deactivate_activate_accelero_108_active: {value: ""},
+			deactivate_activate_accelero_108: {value: 0},
+			reset_timeout_108_active:{value: ""},
+			reset_timeout_108: {value: 60, validate: NCD_validators.number_range(60, 65535)},
+			reset_mode_to_disabled_108_active: {value: ""},
+			reset_mode_to_disabled_108: {value: 0},
+			rtc_interval_108_active: {value: ""},
+			rtc_interval_108: {value: 0},
+			rtc_108:{value:0}
 		},
 		inputs: 0,
 		outputs: 1,
@@ -570,7 +586,7 @@
 					"25": "25 - Asset Monitor",
 					"26": "26 - Pressure Sensor",
 					"27": "27 - Environmental Sensor",
-					"28": "28 - 3 Channel Current Sensor",
+					"28": "28 - 3-Phase Current Sensor",
 					"29": "29 - Linear Displacement Sensor",
 					"30": "30 - Structural Monitoring Sensor",
 					"31": "31 - Air Quality TVOC eCO2 Temperature and Humidity Sensor",
@@ -641,6 +657,7 @@
 					"181": "181 - C1D2 Two Channel Vibration Plus",
 					"200": "200 - 4-20mA Pass Through",
 					"202": "202 - Weather Station",
+					"217": "217 - Wireless Weight Scale",
 					"502": "502 - C_50-27",
 					"505": "505 - Custom_SAP_Current_1C",
 					"506": "506 - Custom_SAP_Current_3C",
@@ -860,7 +877,7 @@
 			<option value="25">25 - Asset Monitor</option>
 			<option value="26">26 - Pressure & Temperature (PSI)</option>
 			<option value="27">27 - Environmental</option>
-			<option value="28">28 - 3-Channel Current Monitor</option>
+			<option value="28">28 - 3-Phase Current Monitor</option>
 			<option value="29">29 - Linear Displacement Sensor</option>
 			<option value="30">30 - Structural Monitoring Sensor</option>
 			<option value="31">31 - Air Quality TVOC eCO2 Temperature and Humidity Sensor</option>
@@ -933,6 +950,7 @@
 			<option value="181">181 - C1D2 Two Channel Vibration Plus</option>
 			<option value="200">200 - 4-20mA Pass Through</option>
 			<option value="202">202 - Weather Station</option>
+			<option value="217">217 - Wireless Weight Scale</option>
 			<option value="502">502 - C_50-27</option>
 			<option value="505">505 - Custom_SAP_Current_1C</option>
 			<option value="506">506 - Custom_SAP_Current_3C</option>
@@ -2253,8 +2271,19 @@
 			</div>
 			<div class="ncd-dependent" data-sensor-108>
 				<div class="form-row ncd-active-check">
-					<label for="node-input-clear_all_counters_108"><i class="icon-tag"></i>Clear All Counters</label>
-					<input type="checkbox" id="node-input-clear_all_counters_108" value="1">
+					<strong>Clear Counters</strong>
+					<div>
+						<label for="node-input-clear_timers_108_active">Active:</label>
+						<input type="checkbox" id="node-input-clear_timers_108_active" class="ncd-config-toggle" data-target-id="node-input-clear_timers_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-clear_timers_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-clear_timers_108">
+							<option value="7" selected>Digital in 1, 2 and 3</option>
+							<option value="16">Magnetometer</option>
+							<option value="8">Accelerometer</option>
+						</select>
+					</div>
 				</div>
 				<div class="form-row ncd-active-check">
 					<strong>Set Accelerometer Threshold</strong>
@@ -2291,12 +2320,12 @@
 				<div class="form-row ncd-active-check">
 					<strong>Set Contact Closure Detection</strong>
 					<div>
-						<label for="node-input-input_two_108_active">Active:</label>
-						<input type="checkbox" id="node-input-input_two_108_active" class="ncd-config-toggle" data-target-id="node-input-input_two_108" value="1">
+						<label for="node-input-input_two_33_active">Active:</label>
+						<input type="checkbox" id="node-input-input_two_33_active" class="ncd-config-toggle" data-target-id="node-input-input_two_33" value="1">
 					</div>
 					<div>
-						<label for="node-input-input_two_108"><i class="icon-tag"></i>Value:</label>
-						<select id="node-input-input_two_108">
+						<label for="node-input-input_two_33"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-input_two_33">
 							<option value="0">Falling Edge Trigger</option>
 							<option value="1" selected>Rising Edge Trigger</option>
 						</select>
@@ -2382,6 +2411,13 @@
 			<div class="ncd-dependent" data-sensor-108>
 				<div class="form-row ncd-active-check">
 					<strong>Enable Push Notification</strong>
+					<p>
+						IO1 - Digital input<br>
+						IO2 - Current Sensor<br>
+						IO3 - OPTO Input<br>
+						IO4 - Accelerometer<br>
+						IO5 - Magnetometer<br>
+					</p>
 					<div>
 						<label for="node-input-push_notification_108_active">Active:</label>
 						<input type="checkbox" id="node-input-push_notification_108_active" class="ncd-config-toggle" data-target-id="node-input-push_notification_108" value="1">
@@ -2424,6 +2460,97 @@
 						</select>
 					</div>
 				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Enable Quality Of Service (QoS)</strong>
+					<div>
+						<label for="node-input-qos_108_active">Active:</label>
+						<input type="checkbox" id="node-input-qos_108_active" class="ncd-config-toggle" data-target-id="node-input-qos_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-qos_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-qos_108">
+							<option value="0" selected>Disabled</option>
+							<option value="1">Enabled</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Enable Accelerometer</strong>
+					<div>
+						<label for="node-input-deactivate_activate_accelero_108_active">Active:</label>
+						<input type="checkbox" id="node-input-deactivate_activate_accelero_108_active" class="ncd-config-toggle" data-target-id="node-input-deactivate_activate_accelero_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-deactivate_activate_accelero_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-deactivate_activate_accelero_108">
+							<option value="0" selected>Disabled</option>
+							<option value="1">Enabled</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Reset Timeout</strong>
+					<p class="caption">
+						Valid range: 60 - 65535
+					</p>
+					<div>
+						<label for="node-input-reset_timeout_108_active">Active:</label>
+						<input type="checkbox" id="node-input-reset_timeout_108_active" class="ncd-config-toggle" data-target-id="node-input-reset_timeout_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-reset_timeout_108"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-reset_timeout_108" placeholder="60" value="60">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong> Set Reset Mode to Disabled</strong>
+					<div>
+						<label for="node-input-reset_mode_to_disabled_108_active">Active:</label>
+						<input type="checkbox" id="node-input-reset_mode_to_disabled_108_active" class="ncd-config-toggle" data-target-id="node-input-reset_mode_to_disabled_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-reset_mode_to_disabled_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-reset_mode_to_disabled_108">
+							<option value="0" selected>Do not reset counters</option>
+							<option value="1">Based on Shift Ends</option>
+							<option value="2">Based on the Timeout Provided</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set RTC</strong>
+					<div>
+						<label for="node-input-rtc_108"><i class="icon-tag"></i>Active:</label>
+						<input type="checkbox" id="node-input-rtc_108" value="1">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong> Set RTC Interval</strong>
+					<div>
+						<label for="node-input-rtc_interval_108_active">Active:</label>
+						<input type="checkbox" id="node-input-rtc_interval_108_active" class="ncd-config-toggle" data-target-id="node-input-rtc_interval_108" value="1">
+					</div>
+					<div>
+						<label for="node-input-rtc_interval_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-rtc_interval_108">
+							<option value="0" selected>1 minute</option>
+							<option value="1">5 minutes</option>
+							<option value="2">10 minutes</option>
+							<option value="3">15 minutes</option>
+							<option value="4">30 minutes</option>
+							<option value="5">45 minutes</option>
+							<option value="6">1 hour</option>
+							<option value="7">2 hours</option>
+							<option value="8">3 hours</option>
+							<option value="9">4 hours</option>
+							<option value="10">6 hours</option>
+							<option value="11">8 hours</option>
+							<option value="12">12 hours</option>
+						</select>
+					</div>
+				</div>
+
+
 			</div>
 			<div class="ncd-dependent" data-sensor-35 data-sensor-36>
 				<hr>
@@ -2961,6 +3088,7 @@
 			<div class="ncd-dependent" data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114>
 				<div class="form-row ncd-active-check">
 					<strong>Set Auto Raw Interval</strong>
+					<p>The interval is determined by the sample interval. If the value is set to 1 and the sample interval is 10 minutes, raw data will be sent every 10 minutes. If the value is set to 5, raw data will be sent every 50 minutes.</p>
 					<div>
 						<label for="node-input-auto_raw_interval_110_active">Active:</label>
 						<input type="checkbox" id="node-input-auto_raw_interval_110_active" class="ncd-config-toggle" data-target-id="node-input-auto_raw_interval_110" value="1">

package/wireless.js

@@ -1017,8 +1017,8 @@ module.exports = function(RED) {
 								if(config.clear_counter_33){
 									promises.clear_counter_33 = node.config_gateway.config_set_clear_counter_33(mac);
 								}
-								if(config.input_two_108_active){
-									promises.input_two_108 = node.config_gateway.config_set_input_two_108(mac, parseInt(config.input_two_108));
+								if(config.input_two_33_active){
+									promises.input_two_33 = node.config_gateway.config_set_input_two_108(mac, parseInt(config.input_two_33));
 								}
 								if(config.counter_threshold_108_active){
 									promises.counter_threshold_108 = node.config_gateway.config_set_counter_threshold_108(mac, parseInt(config.counter_threshold_108));
@@ -1477,8 +1477,8 @@ module.exports = function(RED) {
 								if(config.accelerometer_state_108_active){
 									promises.accelerometer_state_108 = node.config_gateway.config_set_accelerometer_state_108(mac, parseInt(config.accelerometer_state_108));
 								}
-								if(config.clear_all_counters_108){
-									promises.clear_all_counters_108 = node.config_gateway.config_clear_timers_108(mac);
+								if(config.clear_timers_108_active){
+									promises.clear_timers_108 = node.config_gateway.config_set_clear_timers_108(mac, parseInt(config.clear_timers_108));
 								}
 								if(config.accelerometer_threshold_108_active){
 									promises.accelerometer_threshold_108 = node.config_gateway.config_set_accelerometer_threshold_108(mac, parseInt(config.accelerometer_threshold_108));
@@ -1501,6 +1501,24 @@ module.exports = function(RED) {
 								if(config.push_notification_108_active){
 									promises.push_notification_108 = node.config_gateway.config_set_push_notification_108(mac, parseInt(config.push_notification_108));
 								}
+								if(config.qos_108_active){
+									promises.qos_108 = node.config_gateway.config_set_qos_108(mac, parseInt(config.qos_108));
+								}
+								if(config.deactivate_activate_accelero_108_active){
+									promises.deactivate_activate_accelero_108 = node.config_gateway.config_set_deactivate_activate_accelero_108(mac, parseInt(config.deactivate_activate_accelero_108));
+								}
+								if(config.reset_timeout_108_active){
+									promises.reset_timeout_108 = node.config_gateway.config_set_reset_timeout_108(mac, parseInt(config.reset_timeout_108));
+								}
+								if(config.reset_mode_to_disabled_108_active){
+									promises.reset_mode_to_disabled_108 = node.config_gateway.config_set_reset_mode_to_disabled_108(mac, parseInt(config.reset_mode_to_disabled_108));
+								}
+								if(config.rtc_108){
+									promises.rtc_108 = node.config_gateway.config_set_rtc_108(mac);
+								}
+								if(config.rtc_interval_108_active){
+									promises.rtc_interval_108 = node.config_gateway.config_set_rtc_interval_108(mac, parseInt(config.rtc_interval_108));
+								}
 								break;
 							case 110:
 								if(config.output_data_rate_101_active){
@@ -1549,7 +1567,7 @@ module.exports = function(RED) {
 									promises.auto_raw_interval_110 = node.config_gateway.config_set_auto_raw_interval_110(mac, parseInt(config.auto_raw_interval_110));
 								}
 								if(config.auto_raw_destination_110_active){
-									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110));
+									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110, 16));
 								}
 								if(config.clear_probe_uptimers_110_active){
 									promises.clear_probe_uptimers_110 = node.config_gateway.config_set_clear_probe_uptimers_110(mac, parseInt(config.clear_probe_uptimers_110));
@@ -1623,7 +1641,7 @@ module.exports = function(RED) {
 									promises.auto_raw_interval_110 = node.config_gateway.config_set_auto_raw_interval_110(mac, parseInt(config.auto_raw_interval_110));
 								}
 								if(config.auto_raw_destination_110_active){
-									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110));
+									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110, 16));
 								}
 								if(config.clear_probe_uptimers_110_active){
 									promises.clear_probe_uptimers_110 = node.config_gateway.config_set_clear_probe_uptimers_110(mac, parseInt(config.clear_probe_uptimers_110));
@@ -1688,7 +1706,7 @@ module.exports = function(RED) {
 									promises.auto_raw_interval_110 = node.config_gateway.config_set_auto_raw_interval_110(mac, parseInt(config.auto_raw_interval_110));
 								}
 								if(config.auto_raw_destination_110_active){
-									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110));
+									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110, 16));
 								}
 								if(config.clear_probe_uptimers_110_active){
 									promises.clear_probe_uptimers_110 = node.config_gateway.config_set_clear_probe_uptimers_110(mac, parseInt(config.clear_probe_uptimers_110));
@@ -1762,7 +1780,7 @@ module.exports = function(RED) {
 									promises.auto_raw_interval_110 = node.config_gateway.config_set_auto_raw_interval_110(mac, parseInt(config.auto_raw_interval_110));
 								}
 								if(config.auto_raw_destination_110_active){
-									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110));
+									promises.auto_raw_destination_110 = node.config_gateway.config_set_auto_raw_destination_110(mac, parseInt(config.auto_raw_destination_110, 16));
 								}
 								if(config.clear_probe_uptimers_110_active){
 									promises.clear_probe_uptimers_110 = node.config_gateway.config_set_clear_probe_uptimers_110(mac, parseInt(config.clear_probe_uptimers_110));