@ncd-io/node-red-enterprise-sensors 1.0.6 → 1.0.7

package/lib/WirelessGateway.js

@@ -142,7 +142,7 @@ module.exports = class WirelessSensor{
 				}
 			}
 			// #OTF
-			var otf_devices = [23,26,39,45,48,52,58,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
+			var otf_devices = [23,26,33,39,45,48,52,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
 			var device_type = msbLsb(frame.data[6], frame.data[7]);
 			// var device_type = frame.data[7];
 
@@ -294,7 +294,7 @@ module.exports = class WirelessSensor{
 		};
 
 		// #OTF
-		var otf_devices = [23,26,39,45,48,52,58,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
+		var otf_devices = [23,26,33,39,45,48,52,58,74,76,78,79,80,81,82,84,88,89,90,91,101,102,105,106,107,108,110,111,112,114,180,181,519,520,521,531,535,537,538,539,540,1010,1011];
 		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) {
@@ -712,7 +712,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 == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
+			}else if(parsed.sensor_type == 33 || parsed.sensor_type == 80 ||  parsed.sensor_type == 81 || parsed.sensor_type == 82 || parsed.sensor_type == 84 || parsed.sensor_type == 180 || parsed.sensor_type == 181 || parsed.sensor_type == 515 || parsed.sensor_type == 519 || parsed.sensor_type == 531 || parsed.sensor_type == 537 || parsed.sensor_type == 538){
 				parsed.sensor_data = this.sensor_types[parsed.sensor_type].parse(payload, parsed, frame.mac);
 				if(!parsed.sensor_data){
 					return;
@@ -795,11 +795,26 @@ module.exports = class WirelessSensor{
 		return this.config_send(sensor_mac, packet);
 	}
 	config_set_change_detection(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch1');
 		if(!perc) perc = 0;
 		if(!interval) interval = 0;
 		var packet = [247, 7, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_change_detection_ch2(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch2');
+		if(!perc) perc = 0;
+		if(!interval) interval = 0;
+		var packet = [247, 8, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_change_detection_ch3(sensor_mac, enabled, perc, interval){
+		console.log('config_set_change_detection_ch3');
+		if(!perc) perc = 0;
+		if(!interval) interval = 0;
+		var packet = [247, 9, 0, 0, 0, enabled, perc, interval >> 16, (interval >> 8) & 255, interval & 255];
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_bp_altitude(sensor_mac, alt){
 		var packet = [244, 1, 0, 0, 0, alt >> 8, alt & 255];
 		return this.config_send(sensor_mac, packet);
@@ -1219,6 +1234,12 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_push_notification_108(sensor_mac, value){
+		console.log('config_set_push_notification_108');
+		var packet = [244, 45, 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];
@@ -1419,7 +1440,6 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_13(sensor_mac, calib){
 		console.log('config_set_current_calibration_13');
-		calib = calib * 100;
 		var packet = [244, 1, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
@@ -1428,7 +1448,6 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_ch2_19(sensor_mac, calib){
 		console.log('config_set_current_calibration_ch2_19');
-		calib = calib * 100;
 		var packet = [244, 3, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
@@ -1437,13 +1456,36 @@ module.exports = class WirelessSensor{
 	}
 	config_set_current_calibration_ch3_28(sensor_mac, calib){
 		console.log('cconfig_set_current_calibration_ch3_28');
-		calib = calib * 100;
 		var packet = [244, 5, 0, 0, 0];
 		var cal_val = int2Bytes(calib, 4);
 		packet.push(...cal_val);
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_current_calibration_13_dep(sensor_mac, calib){
+		console.log('config_set_current_calibration_13_dep');
+		var packet = [244, 1, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch2_19_dep(sensor_mac, calib){
+		console.log('config_set_current_calibration_ch2_19_dep');
+		var packet = [244, 3, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_current_calibration_ch3_28_dep(sensor_mac, calib){
+		console.log('cconfig_set_current_calibration_ch3_28_dep');
+		var packet = [244, 5, 0, 0, 0];
+		var cal_val = int2Bytes(calib, 2);
+		packet.push(...cal_val);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_rx485_timeout_1011(sensor_mac, value){
 		console.log('config_set_Rx485_timeout_1011');
 		var packet = [244, 48, 0, 0, 23, value];
@@ -1464,6 +1506,24 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_stop_bit_1011(sensor_mac, value){
+		console.log('config_set_stop_bit_1011');
+		var packet = [244, 34, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_parity_1011(sensor_mac, value){
+		console.log('config_set_parity_1011');
+		var packet = [244, 33, 0, 0, 23, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_reboot_1011(sensor_mac){
+		console.log('config_set_reboot_1011');
+		var packet = [247, 64, 0, 0, 0, 5, 22, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_set_operation_mode_531(sensor_mac, mode){
 		console.log('config_set_operation_mode_531');
 		console.log(mode);
@@ -1471,6 +1531,38 @@ module.exports = class WirelessSensor{
 		console.log(packet);
 		return this.config_send(sensor_mac, packet);
 	}
+	config_set_calibration_58(sensor_mac){
+		console.log('config_set_calibration_58');
+		var packet = [244, 32, 0, 0, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_factory_reset_tank_probe_58(sensor_mac){
+		console.log('config_set_factory_reset_tank_probe_58');
+		var packet = [244, 33, 0, 0, 23];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_max_range_58(sensor_mac, value){
+		console.log('config_set_max_range_58');
+		var packet = [244, 34, 0, 0, 23, 39, 16];
+		var max = int2Bytes(value, 2);
+		packet.push(...max);
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_clear_counter_33(sensor_mac){
+		console.log('config_clear_counter_33');
+		var packet = [244, 36, 0, 0, 0, 31];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
+	config_set_push_notification_33(sensor_mac, value){
+		console.log('config_set_push_notification_33');
+		var packet = [244, 45, 0, 0, 0, value];
+		console.log(packet);
+		return this.config_send(sensor_mac, packet);
+	}
 	config_get_delay(sensor_mac){
 		return new Promise((fulfill, reject) => {
 			this.config_send(sensor_mac, [247, 21, 0, 0, 0]).then((res) => {
@@ -2350,9 +2442,18 @@ function sensor_types(parent){
 		},
 		'33': {
 			name: 'AC Current Detect Sensor',
-			parse: (d) => {
-				return {
-					input_1: d[0]
+			parse: (payload, parsed, mac) => {
+				if(parsed.firmware > 3){
+					return {
+						input_1: payload[8],
+						current_detect: payload[9],
+						total_uptime: payload.slice(10, 14).reduce(msbLsb),
+						total_cycle_count: payload.slice(14, 18).reduce(msbLsb)
+					};
+				}else{
+					return {
+						input_1: payload[8]
+					};
 				};
 			}
 		},
@@ -2673,12 +2774,13 @@ function sensor_types(parent){
 					filtered_range: d.slice(0, 2).reduce(msbLsb),
 					long_range_algorithm: d.slice(2, 4).reduce(msbLsb),
 					second_chance:  d.slice(4, 6).reduce(msbLsb),
-					copare_reading:  d.slice(6, 8).reduce(msbLsb),
-					short_range_algorithm: d.slice(8, 10).reduce(msbLsb),
-					trusted_reading:  d.slice(10, 12).reduce(msbLsb),
-					final_filter:  d.slice(12, 14).reduce(msbLsb),
-					raw_final:  d.slice(14, 16).reduce(msbLsb),
-					final_index:  d.slice(16, 18).reduce(msbLsb),
+					second_reading: d.slice(6, 8).reduce(msbLsb),
+					compare_reading:  d.slice(8, 10).reduce(msbLsb),
+					short_range_algorithm: d.slice(10, 12).reduce(msbLsb),
+					trusted_reading:  d.slice(12, 14).reduce(msbLsb),
+					final_filter:  d.slice(14, 16).reduce(msbLsb),
+					raw_final:  d.slice(16, 18).reduce(msbLsb),
+					final_index:  d.slice(18, 20).reduce(msbLsb),
 				};
 			}
 		},
@@ -2813,6 +2915,22 @@ function sensor_types(parent){
 				};
 			}
 		},
+		'74': {
+			name: 'Wireless Temp Humidity Pressure Air quality Sensor',
+			parse: (d) => {
+				return {
+					temperature: signInt(d.slice(0, 2).reduce(msbLsb), 16) *100,
+					pressure: d.slice(2, 6).reduce(msbLsb) * 100,
+					humidity: d.slice(6, 10).reduce(msbLsb) * 1000,
+					resistance: d.slice(10, 14).reduce(msbLsb),
+					iaq: d.slice(14, 16).reduce(msbLsb),
+					co2_eqv: d.slice(16, 18).reduce(msbLsb),
+					breath_voc: d.slice(18, 22).reduce(msbLsb)* 100,
+					static_iaq: d.slice(22, 26).reduce(msbLsb)* 100,
+					iaq_accuracy: d[27]
+				};
+			}
+		},
 		'75': {
 			name: 'Siemens Air Velocity Probe',
 			parse: (d) => {
@@ -4294,6 +4412,7 @@ function sensor_types(parent){
 					'destination_address': toMac(frame.slice(12, 16)),
 					'mode': frame_data.mode,
 					'odr_1': frame_data.odr_1+'Hz',
+					'odr_2': frame_data.odr_2+'Hz',
 					'sampling_duration_1': frame_data.sampling_duration_1,
 					'sampling_duration_2': frame_data.sampling_duration_2,
 					'filter_status': frame_data.filter_status,
@@ -4314,6 +4433,7 @@ function sensor_types(parent){
 					'destination_address': toMac(frame.slice(12, 16), false),
 					'mode': frame[16],
 					'odr_1': frame[17],
+					'odr_2': frame[18],
 					'sampling_duration_1': frame[19],
 					'sampling_duration_2': frame[20],
 					'filter_status': frame[21],
@@ -5704,7 +5824,8 @@ function sensor_types(parent){
 					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)
+					magnetometer_uptime: d.slice(36, 40).reduce(msbLsb),
+					io_states: d[40]
 				};
 			}
 		},

package/package.json

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

package/wireless.html

@@ -201,14 +201,31 @@
 			change_pr: {value: "0", validate: NCD_validators.number_range(0, 255)},
 			change_interval: {value: "0", validate: NCD_validators.number_range(0, 16712198)},
 
+			change_detection_ch2_active: {value: ""},
+			change_enabled_ch2: {value: ""},
+			change_pr_ch2: {value: "0", validate: NCD_validators.number_range(0, 255)},
+			change_interval_ch2: {value: "0", validate: NCD_validators.number_range(0, 16712198)},
+
+			change_detection_ch3_active: {value: ""},
+			change_enabled_ch3: {value: ""},
+			change_pr_ch3: {value: "0", validate: NCD_validators.number_range(0, 255)},
+			change_interval_ch3: {value: "0", validate: NCD_validators.number_range(0, 16712198)},
+
+
 			current_calibration_13_active: {value: ""},
-			current_calibration_13: {value: "606", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_13: {value: "60600", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_13_dep_active: {value: ""},
+			current_calibration_13_dep: {value: "60600", validate: NCD_validators.number_range(0, 65535)},
 
 			current_calibration_ch2_19_active: {value: ""},
-			current_calibration_ch2_19: {value: "606", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_ch2_19: {value: "60600", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_ch2_19_dep_active: {value: ""},
+			current_calibration_ch2_19_dep: {value: "60600", validate: NCD_validators.number_range(0, 65535)},
 
 			current_calibration_ch3_28_active: {value: ""},
-			current_calibration_ch3_28: {value: "606", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_ch3_28: {value: "60600", validate: NCD_validators.number_range(0, 42949672)},
+			current_calibration_ch3_28_dep_active: {value: ""},
+			current_calibration_ch3_28_dep: {value: "60600", validate: NCD_validators.number_range(0, 65535)},
 
 			bp_altitude: {value: "0", validate: NCD_validators.number_range(0, 65535)},
 			bp_pressure: {value: "0", validate: NCD_validators.number_range(0, 14000)},
@@ -484,8 +501,26 @@
 			auto_address_timeout_1011:{value:0, validate: NCD_validators.number_range(0, 65534)},
 
 			mode_531_active: {value: ""},
-			mode_531: {value: 0}
+			mode_531: {value: 0},
+
+			max_range_58_active:{value: ""},
+			max_range_58: {value: 0, validate: NCD_validators.number_range(0, 16500)},
+			calibration_58: {value: 0},
+			factory_reset_tank_probe_58:{value:0},
 
+			push_notification_108_active:{value: ""},
+			push_notification_108: {value: 0},
+			push_notification_33_active:{value: ""},
+			push_notification_33:{value: 0},
+			clear_counter_33:{value:0},
+
+			stop_bit_1011_active:{value: ""},
+			stop_bit_1011:{value:0},
+
+			set_parity_1011_active:{value: ""},
+			set_parity_1011:{value:0},
+
+			reboot_1011:{value:0}
 		},
 		inputs: 0,
 		outputs: 1,
@@ -560,6 +595,7 @@
 //					"70": "70 - 2 Channel Soil Moisture Temperature and EC Sensor",
 					"71": "71 - 3 Channel Soil Moisture Temperature and EC Sensor",
 					"72": "72 - SDI Soil Moisture Temperature Moisture Probe",
+					"74": "74 - Wireless Temp Humidity Pressure Air quality Sensor",
 					"75": "75 - Siemens Air Velocity Probe",
 					"76": "76 - Wireless CO Gas Sensor",
 					"77": "77 - 3 Channel SDI Soil Moisture Temperature Moisture Probe",
@@ -635,7 +671,7 @@
 			$('#node-input-number_of_regs_to_rd_539').change(function(){
 				let registers = $(this).val();
 				$('#register_list_539 > div:nth-child(-n+'+registers+')').show();
-				$('#register_list_539 > div:nth-last-child(-n+'+(10-registers)+')').hide();
+				$('#register_list_539 > div:nth-last-child(-n+'+(32-registers)+')').hide();
 			});
 			// $('#node-input-number_of_regs_to_rd_539_active').change(function(){
 			// 	if($(this).prop('checked')){
@@ -851,6 +887,7 @@
 -->
 			<option value="71">71 - 3 Channel Soil Moisture Temperature and EC Sensor</option>
 			<option value="72">72 - SDI-12 Wireless</option>
+			<option value="74">74 - Wireless Temp Humidity Pressure Air quality Sensor</option>
 			<option value="75">75 - Siemens Air Velocity Probe</option>
 			<option value="76">76 - Wireless CO Gas Sensor</option>
 			<option value="77">77 - 3 Channel SDI Soil Moisture Temperature Moisture Probe</option>
@@ -912,7 +949,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-39 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-58 data-sensor-76 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-90 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-105 data-sensor-106 data-sensor-107 data-sensor-108 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-535 data-sensor-537 data-sensor-538 data-sensor-539 data-sensor-540 data-sensor-1010 data-sensor-1011>
+			<div class="form-row ncd-dependent" data-sensor-23 data-sensor-26 data-sensor-33 data-sensor-39 data-sensor-45 data-sensor-48 data-sensor-52 data-sensor-58 data-sensor-74 data-sensor-76 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-90 data-sensor-91 data-sensor-101 data-sensor-102 data-sensor-105 data-sensor-106 data-sensor-107 data-sensor-108 data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-180 data-sensor-181 data-sensor-519 data-sensor-520 data-sensor-521 data-sensor-531 data-sensor-535 data-sensor-537 data-sensor-538 data-sensor-539 data-sensor-540 data-sensor-1010 data-sensor-1011>
 				<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">
@@ -1006,69 +1043,168 @@
 					<input type="text" id="node-input-retries">
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-3 data-sensor-10 data-sensor-13>
-				<div class="form-row ncd-active-check">
-					<strong>Percentage Change Detection</strong>
-					<div>
-						<label for="node-input-change_detection_t3_active">Active:</label>
-						<input type="checkbox" id="node-input-change_detection_t3_active" class="ncd-config-toggle" data-target-class="change_detection_t3" value="1">
-					</div>
-					<div class="form-row">
-						<label for="node-input-change_enabled"><i class="icon-tag"></i>Enable:</label>
-						<input type="checkbox" id="node-input-change_enabled" class="change_detection_t3" value="1">
-					</div>
-					<div class="form-row">
-						<label for="node-input-change_pr"><i class="icon-tag"></i>Percentage Change Threshold (0-255)</label>
-						<input type="text" id="node-input-change_pr" class="change_detection_t3">
-					</div>
-					<div class="form-row">
-						<label for="node-input-change_interval"><i class="icon-tag"></i>Percentage Change Interval (seconds)</label>
-						<input type="text" id="node-input-change_interval" class="change_detection_t3">
-					</div>
-				</div>
-			</div>
 			<!-- Current Monitor Options -->
 			<div class="ncd-dependent" data-sensor-13 data-sensor-19 data-sensor-28>
 				<hr>
 				<div class="form-row ncd-active-check">
 					<strong>Channel 1 Current Calibration Value</strong>
+					<p class="caption">
+						New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+					</p>
 					<div>
 						<label for="node-input-current_calibration_13_active">Active:</label>
-						<input type="checkbox" id="node-input-current_calibration_13_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_13_active" value="1">
+						<input type="checkbox" id="node-input-current_calibration_13_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_13" value="1">
 					</div>
 					<div>
 						<label for="node-input-current_calibration_13"><i class="icon-tag"></i> Value:</label>
 						<input type="text" id="node-input-current_calibration_13">
 					</div>
 				</div>
+				<!--
+					<div class="form-row ncd-active-check">
+						<strong>Deprecated: Channel 1 Current Calibration Value</strong>
+						<p class="caption">
+							Only for use with sensors with firmware versions 2 or lower.
+							New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+						</p>
+						<div>
+							<label for="node-input-current_calibration_13_dep_active">Active:</label>
+							<input type="checkbox" id="node-input-current_calibration_13_dep_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_13_dep" value="1">
+						</div>
+						<div>
+							<label for="node-input-current_calibration_13_dep"><i class="icon-tag"></i> Value:</label>
+							<input type="text" id="node-input-current_calibration_13_dep">
+						</div>
+					</div>
+				-->
 			</div>
 			<div class="ncd-dependent" data-sensor-19 data-sensor-28>
 				<div class="form-row ncd-active-check">
 					<strong>Channel 2 Current Calibration Value</strong>
+					<p class="caption">
+						New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+					</p>
 					<div>
 						<label for="node-input-current_calibration_ch2_19_active">Active:</label>
-						<input type="checkbox" id="node-input-current_calibration_ch2_19_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch2_19_active" value="1">
+						<input type="checkbox" id="node-input-current_calibration_ch2_19_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch2_19" value="1">
 					</div>
 					<div>
 						<label for="node-input-current_calibration_ch2_19"><i class="icon-tag"></i> Value:</label>
 						<input type="text" id="node-input-current_calibration_ch2_19">
 					</div>
 				</div>
+				<!--
+					<div class="form-row ncd-active-check">
+						<strong>Deprecated: Channel 2 Current Calibration Value</strong>
+						<p class="caption">
+							Only for use with sensors with firmware versions 2 or lower.
+							New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+						</p>
+						<div>
+							<label for="node-input-current_calibration_ch2_19_dep_active">Active:</label>
+							<input type="checkbox" id="node-input-current_calibration_ch2_19_dep_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch2_19_dep" value="1">
+						</div>
+						<div>
+							<label for="node-input-current_calibration_ch2_19_dep"><i class="icon-tag"></i> Value:</label>
+							<input type="text" id="node-input-current_calibration_ch2_19_dep">
+						</div>
+					</div>
+				-->
 			</div>
 			<div class="ncd-dependent" data-sensor-28>
 				<div class="form-row ncd-active-check">
 					<strong>Channel 3 Current Calibration Value</strong>
+					<p class="caption">
+						New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+					</p>
 					<div>
 						<label for="node-input-current_calibration_ch3_28_active">Active:</label>
-						<input type="checkbox" id="node-input-current_calibration_ch3_28_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch3_28_active" value="1">
+						<input type="checkbox" id="node-input-current_calibration_ch3_28_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch3_28" value="1">
 					</div>
 					<div>
 						<label for="node-input-current_calibration_ch3_28"><i class="icon-tag"></i> Value:</label>
 						<input type="text" id="node-input-current_calibration_ch3_28">
 					</div>
 				</div>
+				<!--
+					<div class="form-row ncd-active-check">
+						<strong>Deprecated: Channel 3 Current Calibration Value</strong>
+						<p class="caption">
+							Only for use with sensors with firmware versions 2 or lower.
+							New calibration value = ((current_read_by_meter/current_read_by_sensor)*last_stored_calibration_value)*100
+						</p>
+						<div>
+							<label for="node-input-current_calibration_ch3_28_dep_active">Active:</label>
+							<input type="checkbox" id="node-input-current_calibration_ch3_28_dep_active" class="ncd-config-toggle" data-target-id="node-input-current_calibration_ch3_28_dep" value="1">
+						</div>
+						<div>
+							<label for="node-input-current_calibration_ch3_28_dep"><i class="icon-tag"></i> Value:</label>
+							<input type="text" id="node-input-current_calibration_ch3_28_dep">
+						</div>
+					</div>
+				-->
 			</div>
-
+		<div class="ncd-dependent" data-sensor-3 data-sensor-10 data-sensor-13 data-sensor-28>
+			<div class="form-row ncd-active-check">
+				<strong>Percentage Change Detection - Channel 1</strong>
+				<div>
+					<label for="node-input-change_detection_t3_active">Active:</label>
+					<input type="checkbox" id="node-input-change_detection_t3_active" class="ncd-config-toggle" data-target-class="change_detection_t3" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_enabled"><i class="icon-tag"></i>Enable:</label>
+					<input type="checkbox" id="node-input-change_enabled" class="change_detection_t3" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_pr"><i class="icon-tag"></i>Percentage Change Threshold (0-255)</label>
+					<input type="text" id="node-input-change_pr" class="change_detection_t3">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_interval"><i class="icon-tag"></i>Percentage Change Interval (seconds)</label>
+					<input type="text" id="node-input-change_interval" class="change_detection_t3">
+				</div>
+			</div>
+		</div>
+		<div class="ncd-dependent" data-sensor-28>
+			<div class="form-row ncd-active-check">
+				<strong>Percentage Change Detection - Channel 2</strong>
+				<div>
+					<label for="node-input-change_detection_ch2_active">Active:</label>
+					<input type="checkbox" id="node-input-change_detection_ch2_active" class="ncd-config-toggle" data-target-class="change_detection_ch2" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_enabled_ch2"><i class="icon-tag"></i>Enable:</label>
+					<input type="checkbox" id="node-input-change_enabled_ch2" class="change_detection_ch2" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_pr_ch2"><i class="icon-tag"></i>Percentage Change Threshold (0-255)</label>
+					<input type="text" id="node-input-change_pr_ch2" class="change_detection_ch2">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_interval_ch2"><i class="icon-tag"></i>Percentage Change Interval (seconds)</label>
+					<input type="text" id="node-input-change_interval_ch2" class="change_detection_ch2">
+				</div>
+			</div>
+			<div class="form-row ncd-active-check">
+				<strong>Percentage Change Detection - Channel 3</strong>
+				<div>
+					<label for="node-input-change_detection_ch3_active">Active:</label>
+					<input type="checkbox" id="node-input-change_detection_ch3_active" class="ncd-config-toggle" data-target-class="change_detection_ch3" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_enabled_ch3"><i class="icon-tag"></i>Enable:</label>
+					<input type="checkbox" id="node-input-change_enabled_ch3" class="change_detection_ch3" value="1">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_pr_ch3"><i class="icon-tag"></i>Percentage Change Threshold (0-255)</label>
+					<input type="text" id="node-input-change_pr_ch3" class="change_detection_ch3">
+				</div>
+				<div class="form-row">
+					<label for="node-input-change_interval_ch3"><i class="icon-tag"></i>Percentage Change Interval (seconds)</label>
+					<input type="text" id="node-input-change_interval_ch3" class="change_detection_ch3">
+				</div>
+			</div>
+		</div>
 			<!-- Barometric Pressure Options -->
 			<div class="ncd-dependent" data-sensor-6>
 				<div class="form-row">
@@ -2039,6 +2175,14 @@
 						</select>
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-33>
+				<div class="form-row ncd-active-check">
+					<label for="node-input-clear_counter_33"><i class="icon-tag"></i>Clear Counter Value</label>
+					<input type="checkbox" id="node-input-clear_counter_33" value="1">
+				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-108>
 				<div class="form-row">
 					<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">
@@ -2057,6 +2201,8 @@
 						<input type="text" id="node-input-accelerometer_threshold_108" placeholder="10" value="10">
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-108 data-sensor-33>
 				<div class="form-row ncd-active-check">
 					<strong>Set Input Debounce Time</strong>
 					<p class="caption">
@@ -2071,6 +2217,38 @@
 						<input type="text" id="node-input-debounce_time_108" placeholder="10" value="10">
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-33>
+				<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">
+					</div>
+					<div>
+						<label for="node-input-input_two_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-input_two_108">
+							<option value="0">Falling Edge Trigger</option>
+							<option value="1" selected>Rising Edge Trigger</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Enable Push Notification</strong>
+					<div>
+						<label for="node-input-push_notification_33_active">Active:</label>
+						<input type="checkbox" id="node-input-push_notification_33_active" class="ncd-config-toggle" data-target-id="node-input-push_notification_33" value="1">
+					</div>
+					<div>
+						<label for="node-input-push_notification_33"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-push_notification_33">
+							<option value="0" selected>Disable</option>
+							<option value="2">Enable</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-108>
 				<div class="form-row ncd-active-check">
 					<strong>Set Contact Closure Detection</strong>
 					<div>
@@ -2113,6 +2291,8 @@
 						</select>
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-108 data-sensor-33>
 				<div class="form-row ncd-active-check">
 					<strong>Counter Threshold</strong>
 					<p class="caption">
@@ -2130,6 +2310,52 @@
 					</div>
 				</div>
 			</div>
+			<div class="ncd-dependent" data-sensor-108>
+				<div class="form-row ncd-active-check">
+					<strong>Enable Push Notification</strong>
+					<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">
+					</div>
+					<div>
+						<label for="node-input-push_notification_108"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-push_notification_108">
+							<option value="0" selected>Disable All</option>
+							<option value="31">Enable All</option>
+							<option value="1">Enable on IO 1</option>
+							<option value="2">Enable on IO 2</option>
+							<option value="3">Enable on IO 2 and 1</option>
+							<option value="4">Enable on IO 3</option>
+							<option value="5">Enable on IO 3 and 1</option>
+							<option value="6">Enable on IO 3 and 2</option>
+							<option value="7">Enable on IO 3 to 1</option>
+							<option value="8">Enable on IO 4</option>
+							<option value="9">Enable on IO 4 and 1</option>
+							<option value="10">Enable on IO 4 and 2</option>
+							<option value="11">Enable on IO 4, 1 and 2</option>
+							<option value="12">Enable on IO 4 and 3</option>
+							<option value="13">Enable on IO 4, 1 and 3</option>
+							<option value="14">Enable on IO 4, 2 and 3</option>
+							<option value="15">Enable on IO 4 to 1</option>
+							<option value="16">Enable on IO 5</option>
+							<option value="17">Enable on IO 5 and 1</option>
+							<option value="18">Enable on IO 5 and 2</option>
+							<option value="19">Enable on IO 5, 2 and 1</option>
+							<option value="20">Enable on IO 5 and 3</option>
+							<option value="21">Enable on IO 5, 3 and 1</option>
+							<option value="22">Enable on IO 5, 3 and 2</option>
+							<option value="23">Enable on IO 5, 3, 2 and 1</option>
+							<option value="24">Enable on IO 5 and 4</option>
+							<option value="25">Enable on IO 5, 4 and 1</option>
+							<option value="26">Enable on IO 5, 4 and 2</option>
+							<option value="27">Enable on IO 5, 4, 2 and 1</option>
+							<option value="28">Enable on IO 5, 4 and 3</option>
+							<option value="29">Enable on IO 5, 4, 3 and 1</option>
+							<option value="30">Enable on IO 5, 4, 3, and 2</option>
+						</select>
+					</div>
+				</div>
+			</div>
 			<div class="ncd-dependent" data-sensor-35 data-sensor-36>
 				<hr>
 				<div class="form-row ncd-active-check">
@@ -2256,22 +2482,38 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-539>
+			<div class="ncd-dependent" data-sensor-1010 data-sensor-1011>
 				<div class="form-row ncd-active-check">
-					<strong>Set Rx Timeout</strong>
+					<strong>Set Stop Bit</strong>
 					<div>
-						<label for="node-input-rx_timeout_539_active">Active:</label>
-						<input type="checkbox" id="node-input-rx_timeout_539_active" class="ncd-config-toggle" data-target-id="node-input-rx_timeout_539" value="1">
+						<label for="node-input-stop_bit_1011_active">Active:</label>
+						<input type="checkbox" id="node-input-stop_bit_1011_active" class="ncd-config-toggle" data-target-id="node-input-stop_bit_1011" value="1">
 					</div>
 					<div>
-						<label for="node-input-rx_timeout_539"><i class="icon-tag"></i>Value:</label>
-						<input type="text" id="node-input-rx_timeout_539" placeholder="10" value="10">
+						<label for="node-input-stop_bit_1011"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-stop_bit_1011">
+							<option selected="selected" value="0">1</option>
+							<option value="1">2</option>
+						</select>
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Parity</strong>
+					<div>
+						<label for="node-input-set_parity_1011_active">Active:</label>
+						<input type="checkbox" id="node-input-set_parity_1011_active" class="ncd-config-toggle" data-target-id="node-input-set_parity_1011" value="1">
+					</div>
+					<div>
+						<label for="node-input-set_parity_1011"><i class="icon-tag"></i>Value:</label>
+						<select id="node-input-set_parity_1011">
+							<option selected="selected" value="0">None</option>
+							<option value="1">Even</option>
+							<option value="2">Odd</option>
+						</select>
 					</div>
 				</div>
-			</div>
-			<div class="ncd-dependent" data-sensor-1011>
                 <div class="form-row ncd-active-check">
-					<strong>Set rs485 Timeout</strong>
+					<strong>Set Timeout</strong>
 					<div>
 						<label for="node-input-rx485_timeout_1011_active">Active:</label>
 						<input type="checkbox" id="node-input-rx485_timeout_1011_active" class="ncd-config-toggle" data-target-id="node-input-rx485_timeout_1011" value="1">
@@ -2281,6 +2523,23 @@
 						<input type="text" id="node-input-rx485_timeout_1011" placeholder="10" value="10">
 					</div>
 				</div>
+				<div class="form-row ncd-active-check">
+					<strong>Set Auto Address Timeout</strong>
+					<div>
+						<label for="node-input-auto_address_timeout_1011_active">Active:</label>
+						<input type="checkbox" id="node-input-auto_address_timeout_1011_active" class="ncd-config-toggle" data-target-id="node-input-rauto_address_timeout_1011" value="1">
+					</div>
+					<div>
+						<label for="node-input-auto_address_timeout_1011"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-auto_address_timeout_1011" placeholder="10" value="10">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<label for="node-input-reboot_1011"><i class="icon-tag"></i><strong>Reboot Device</strong></label>
+					<input type="checkbox" id="node-input-reboot_1011" value="1">
+				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-1011>
 				<div class="form-row ncd-active-check">
 					<strong>Set Mode</strong>
 					<div>
@@ -2296,19 +2555,19 @@
 						</select>
 					</div>
 				</div>
+			</div>
+			<div class="ncd-dependent" data-sensor-539>
 				<div class="form-row ncd-active-check">
-					<strong>Set Auto Address Timeout</strong>
+					<strong>Set Rx Timeout</strong>
 					<div>
-						<label for="node-input-auto_address_timeout_1011_active">Active:</label>
-						<input type="checkbox" id="node-input-auto_address_timeout_1011_active" class="ncd-config-toggle" data-target-id="node-input-rauto_address_timeout_1011" value="1">
+						<label for="node-input-rx_timeout_539_active">Active:</label>
+						<input type="checkbox" id="node-input-rx_timeout_539_active" class="ncd-config-toggle" data-target-id="node-input-rx_timeout_539" value="1">
 					</div>
 					<div>
-						<label for="node-input-auto_address_timeout_1011"><i class="icon-tag"></i>Value:</label>
-						<input type="text" id="node-input-auto_address_timeout_1011" placeholder="10" value="10">
+						<label for="node-input-rx_timeout_539"><i class="icon-tag"></i>Value:</label>
+						<input type="text" id="node-input-rx_timeout_539" placeholder="10" value="10">
 					</div>
 				</div>
-			</div>
-			<div class="ncd-dependent" data-sensor-539>
 				<div class="form-row ncd-active-check">
 					<strong>Set Bootup Time</strong>
 					<div>
@@ -2414,6 +2673,7 @@
 							<option value="29">29</option>
 							<option value="30">30</option>
 							<option value="31">31</option>
+							<option value="32">32</option>
 						</select>
 					</div>
 					<hr>
@@ -2478,6 +2738,138 @@
 								<input type="text" id="node-input-register_value_9_539" class="register_t539" placeholder="10" value="10">
 							</div>
 						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_10_539"><i class="icon-tag"></i>Register 11:</label>
+								<input type="text" id="node-input-register_value_10_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_11_539"><i class="icon-tag"></i>Register 12:</label>
+								<input type="text" id="node-input-register_value_11_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_12_539"><i class="icon-tag"></i>Register 13:</label>
+								<input type="text" id="node-input-register_value_12_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_13_539"><i class="icon-tag"></i>Register 14:</label>
+								<input type="text" id="node-input-register_value_13_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_14_539"><i class="icon-tag"></i>Register 15:</label>
+								<input type="text" id="node-input-register_value_14_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_15_539"><i class="icon-tag"></i>Register 16:</label>
+								<input type="text" id="node-input-register_value_15_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_16_539"><i class="icon-tag"></i>Register 17:</label>
+								<input type="text" id="node-input-register_value_16_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_17_539"><i class="icon-tag"></i>Register 18:</label>
+								<input type="text" id="node-input-register_value_17_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_18_539"><i class="icon-tag"></i>Register 19:</label>
+								<input type="text" id="node-input-register_value_18_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_19_539"><i class="icon-tag"></i>Register 20:</label>
+								<input type="text" id="node-input-register_value_19_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_20_539"><i class="icon-tag"></i>Register 21:</label>
+								<input type="text" id="node-input-register_value_20_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_21_539"><i class="icon-tag"></i>Register 22:</label>
+								<input type="text" id="node-input-register_value_21_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_22_539"><i class="icon-tag"></i>Register 23:</label>
+								<input type="text" id="node-input-register_value_22_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_23_539"><i class="icon-tag"></i>Register 24:</label>
+								<input type="text" id="node-input-register_value_23_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_24_539"><i class="icon-tag"></i>Register 25:</label>
+								<input type="text" id="node-input-register_value_24_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_25_539"><i class="icon-tag"></i>Register 26:</label>
+								<input type="text" id="node-input-register_value_25_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_26_539"><i class="icon-tag"></i>Register 27:</label>
+								<input type="text" id="node-input-register_value_26_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_27_539"><i class="icon-tag"></i>Register 28:</label>
+								<input type="text" id="node-input-register_value_27_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_28_539"><i class="icon-tag"></i>Register 29:</label>
+								<input type="text" id="node-input-register_value_28_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_29_539"><i class="icon-tag"></i>Register 30:</label>
+								<input type="text" id="node-input-register_value_29_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_30_539"><i class="icon-tag"></i>Register 31:</label>
+								<input type="text" id="node-input-register_value_30_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
+						<div class="form-row">
+							<div>
+								<label for="node-input-register_value_31_539"><i class="icon-tag"></i>Register 32:</label>
+								<input type="text" id="node-input-register_value_31_539" class="register_t539" placeholder="10" value="10">
+							</div>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -2570,6 +2962,33 @@
 					</div>
 				</div>
 			</div>
+			<div class="ncd-dependent" data-sensor-58>
+				<hr>
+				<div class="form-row ncd-active-check">
+					<strong>Max Range</strong>
+					<p>Valid Range: 0 - 16500 (mm)</p>
+					<div>
+						<label for="node-input-max_range_58_active">Active:</label>
+						<input type="checkbox" id="node-input-max_range_58_active" class="ncd-config-toggle" data-target-id="node-input-max_range_58" value="1">
+					</div>
+					<div>
+						<label for="node-input-max_range_58"><i class="icon-tag"></i> Value:</label>
+						<input type="text" id="node-input-max_range_58">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<div>
+						<label for="node-input-calibration_58"><i class="icon-tag"></i>Set Calibration:</label>
+						<input type="checkbox" id="node-input-calibration_58" class="ncd-config-toggle" data-target-id="node-input-calibration_58" value="1">
+					</div>
+				</div>
+				<div class="form-row ncd-active-check">
+					<div>
+						<label for="node-input-factory_reset_tank_probe_58"><i class="icon-tag"></i>Factory Reset Tank Probe:</label>
+						<input type="checkbox" id="node-input-factory_reset_tank_probe_58" class="ncd-config-toggle" data-target-id="node-input-factory_reset_tank_probe_58" value="1">
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 </script>

package/wireless.js

@@ -54,9 +54,17 @@ module.exports = function(RED) {
 				this.gateway.digi.report_rssi = config.rssi;
 
 				if(config.comm_type == 'serial'){
-					setTimeout(()=>{node.gateway.digi.serial.setupSerial()}, 5000);
+					if(config.port !== ''){
+						setTimeout(()=>{node.gateway.digi.serial.setupSerial()}, 5000);
+					}else{
+						node.warn('No Port Selected for Serial Communications.')
+					}
 				}else{
-					setTimeout(()=>{node.gateway.digi.serial.setupClient()}, 5000);
+					if(config.tcp_port === '' || config.ip_address === ''){
+						node.warn('TCP Socket not configured for Network Communications. Please enter a Port and IP Address.');
+					}else{
+						setTimeout(()=>{node.gateway.digi.serial.setupClient()}, 5000);
+					}
 				}
 				node.gateway.digi.serial.on('ready', () => {
 					node.gateway.digi.send.at_command('SL').then((res) => {
@@ -868,6 +876,12 @@ module.exports = function(RED) {
 										promises.current_calibration_13 = node.config_gateway.config_set_current_calibration_13(mac, cali);
 									}
 								}
+								// if(config.current_calibration_13_dep_active){
+								// 	var cali = parseInt(config.current_calibration_13_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_13_dep = node.config_gateway.config_set_current_calibration_13_dep(mac, cali);
+								// 	}
+								// }
 								if(config.change_detection_t3_active){
 									promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
 								}
@@ -899,6 +913,18 @@ module.exports = function(RED) {
 										promises.current_calibration_ch2_19 = node.config_gateway.config_set_current_calibration_ch2_19(mac, cali);
 									}
 								}
+								// if(config.current_calibration_13_dep_active){
+								// 	var cali = parseInt(config.current_calibration_13_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_13_dep = node.config_gateway.config_set_current_calibration_13_dep(mac, cali);
+								// 	}
+								// }
+								// if(config.current_calibration_ch2_19_dep_active){
+								// 	var cali = parseInt(config.current_calibration_ch2_19_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_ch2_19_dep = node.config_gateway.config_set_current_calibration_ch2_19_dep(mac, cali);
+								// 	}
+								// }
 								break;
 							case 23:
 								if(config.thermocouple_type_23_active){
@@ -953,7 +979,51 @@ module.exports = function(RED) {
 										promises.current_calibration_ch3_28 = node.config_gateway.config_set_current_calibration_ch3_28(mac, cali);
 									}
 								}
+								// if(config.current_calibration_13_dep_active){
+								// 	var cali = parseInt(config.current_calibration_13_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_13_dep = node.config_gateway.config_set_current_calibration_13_dep(mac, cali);
+								// 	}
+								// }
+								// if(config.current_calibration_ch2_19_dep_active){
+								// 	var cali = parseInt(config.current_calibration_ch2_19_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_ch2_19_dep = node.config_gateway.config_set_current_calibration_ch2_19_dep(mac, cali);
+								// 	}
+								// }
+								// if(config.current_calibration_ch3_28_dep_active){
+								// 	var cali = parseInt(config.current_calibration_ch3_28_dep);
+								// 	if(cali != 0){
+								// 		promises.current_calibration_ch3_28_dep = node.config_gateway.config_set_current_calibration_ch3_28_dep(mac, cali);
+								// 	}
+								// }
+								if(config.change_detection_t3_active){
+									promises.change_detection = node.config_gateway.config_set_change_detection(mac, config.change_enabled ? 1 : 0, parseInt(config.change_pr), parseInt(config.change_interval));
+								}
+								if(config.change_detection_ch2_active){
+									promises.change_detection_ch2 = node.config_gateway.config_set_change_detection_ch2(mac, config.change_enabled_ch2 ? 1 : 0, parseInt(config.change_pr_ch2), parseInt(config.change_interval_ch2));
+								}
+								if(config.change_detection_ch3_active){
+									promises.change_detection_ch3 = node.config_gateway.config_set_change_detection_ch3(mac, config.change_enabled_ch3 ? 1 : 0, parseInt(config.change_pr_ch3), parseInt(config.change_interval_ch3));
+								}
 								break;
+							case 33:
+								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.counter_threshold_108_active){
+									promises.counter_threshold_108 = node.config_gateway.config_set_counter_threshold_108(mac, parseInt(config.counter_threshold_108));
+								}
+								if(config.debounce_time_108_active){
+									promises.debounce_time_108 = node.config_gateway.config_set_debounce_time_108(mac, parseInt(config.debounce_time_108));
+								}
+								if(config.push_notification_33_active){
+									promises.push_notification_33 = node.config_gateway.config_set_push_notification_33(mac, parseInt(config.push_notification_33));
+								}
+							    break;
 							case 35:
 								if(config.counter_threshold_35_active){
 									promises.config_set_counter_threshold_35 = node.config_gateway.config_set_counter_threshold_35(mac, parseInt(config.counter_threshold_35));
@@ -1044,6 +1114,17 @@ module.exports = function(RED) {
 									promises.sensor_boot_time_420ma = node.config_gateway.config_set_sensor_boot_time_420ma(mac, parseInt(config.sensor_boot_time_420ma));
 								}
 							break;
+							case 58:
+								if(config.calibration_58){
+									promises.calibration_58 = node.config_gateway.config_set_calibration_58(mac);
+								}
+								if(config.factory_reset_tank_probe_58){
+									promises.factory_reset_tank_probe_58 = node.config_gateway.config_set_factory_reset_tank_probe_58(mac);
+								}
+								if(config.set_max_range_58_active){
+									promises.set_max_range_58 = node.config_gateway.config_set_max_range_58(mac, parseInt(config.set_max_range_58));
+								}
+							break;
 							case 76:
 								if(config.periodic_check_rate_76_active){
 									promises.periodic_check_rate_76 = node.config_gateway.config_set_periodic_check_rate_76(mac, parseInt(config.periodic_check_rate_76));
@@ -1412,6 +1493,9 @@ module.exports = function(RED) {
 								if(config.counter_threshold_108_active){
 									promises.counter_threshold_108 = node.config_gateway.config_set_counter_threshold_108(mac, parseInt(config.counter_threshold_108));
 								}
+								if(config.push_notification_108_active){
+									promises.push_notification_108 = node.config_gateway.config_set_push_notification_108(mac, parseInt(config.push_notification_108));
+								}
 								break;
 							case 110:
 								if(config.current_calibration_c1_80_active){
@@ -2064,6 +2148,15 @@ module.exports = function(RED) {
 								if(config.rx_timeout_539_active){
 									promises.rx_timeout_539 = node.config_gateway.config_set_rx_timeout_539(mac, parseInt(config.rx_timeout_539));
 								}
+								if(config.stop_bit_1011_active){
+									promises.stop_bit_1011 = node.config_gateway.config_set_stop_bit_1011(mac, parseInt(config.stop_bit_1011));
+								}
+								if(config.set_parity_1011_active){
+									promises.set_parity_1011 = node.config_gateway.config_set_set_parity_1011(mac, parseInt(config.set_parity_1011));
+								}
+								if(config.reboot_1011){
+									promises.reboot_1011 = node.config_gateway.config_set_reboot_1011(mac);
+								}
 								break;
 							case 1011:
 								if(config.stay_on_mode_539_active){
@@ -2081,6 +2174,15 @@ module.exports = function(RED) {
 								if(config.auto_address_timeout_1011_active){
 									promises.auto_address_timeout_1011 = node.config_gateway.config_set_auto_address_timeout_1011(mac, parseInt(config.auto_address_timeout_1011));
 								}
+								if(config.stop_bit_1011_active){
+									promises.stop_bit_1011 = node.config_gateway.config_set_stop_bit_1011(mac, parseInt(config.stop_bit_1011));
+								}
+								if(config.set_parity_1011_active){
+									promises.set_parity_1011 = node.config_gateway.config_set_parity_1011(mac, parseInt(config.set_parity_1011));
+								}
+								if(config.reboot_1011){
+									promises.reboot_1011 = node.config_gateway.config_set_reboot_1011(mac);
+								}
 								break;
 						}
 					}