@ncd-io/node-red-enterprise-sensors 1.4.6 → 1.4.7

package/lib/WirelessGateway.js

@@ -13480,279 +13480,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'119': {
-			name: 'Wireless Machine Run Time Hour Meter',
-			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;
-				}
-				let report_type = "Regular";
-				switch(d[17]){
-					case 0:
-						report_type = "Regular";
-						break;
-					case 1:
-						report_type = "Shift end";
-						break;
-					case 2:
-						report_type = "Interrupt";
-						break;
-					case 3:
-						report_type = "Threshold";
-						break;
-				}
-				if ((payload[7] & 4) != 0) {
-					return {
-						raw_data: "Enabled",
-						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
-						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
-						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
-						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
-						input_acc: d[16] & 8 ? 1 : 0,
-						input_mag: d[16] & 16 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(d[18]).padStart(2, '0'),
-							String(d[19]).padStart(2, '0'),
-							String(d[20]).padStart(2, '0')
-						].join(':'),
-						'temperature': d.slice(21, 23).reduce(msbLsb)/100,
-						'accelero_sample_1':{
-							x:[signInt(d.slice(23, 25).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(25, 27).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(27, 29).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_2':{
-							x:[signInt(d.slice(29, 31).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(31, 33).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(33, 35).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_3':{
-							x:[signInt(d.slice(35, 37).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(37, 39).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(39, 41).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_4':{
-							x:[signInt(d.slice(41, 43).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(43, 45).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(45, 47).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_5':{
-							x:[signInt(d.slice(47, 49).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(49, 51).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(51, 53).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_6':{
-							x:[signInt(d.slice(53, 55).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(55, 57).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(57, 59).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_7':{
-							x:[signInt(d.slice(59, 61).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(61, 63).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(63, 65).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_8':{
-							x:[signInt(d.slice(65, 67).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(67, 69).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(69, 71).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_9':{
-							x:[signInt(d.slice(71, 73).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(73, 75).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(75, 77).reduce(msbLsb),16)/100]
-						},
-						'accelero_sample_10':{
-							x:[signInt(d.slice(77, 79).reduce(msbLsb),16)/100],
-							y:[signInt(d.slice(79, 81).reduce(msbLsb),16)/100],
-							z:[signInt(d.slice(81, 83).reduce(msbLsb),16)/100]
-						}
-					};
-				}else{
-					return {
-						raw_data: "Disabled",
-						accelerometer_counter: d.slice(0, 4).reduce(msbLsb),
-						accelerometer_uptime: d.slice(4, 8).reduce(msbLsb),
-						magnetometer_counter: d.slice(8, 12).reduce(msbLsb),
-						magnetometer_uptime: d.slice(12, 16).reduce(msbLsb),
-						input_acc: d[16] & 8 ? 1 : 0,
-						input_mag: d[16] & 16 ? 1 : 0,
-						report_type: report_type,
-						rtc: [
-							String(d[18]).padStart(2, '0'),
-							String(d[19]).padStart(2, '0'),
-							String(d[20]).padStart(2, '0')
-						].join(':'),
-						'temperature': d.slice(21, 23).reduce(msbLsb)/100
-					};
-				}
-			},
-			'parse_fly': (frame) => {
-				let reset_mode = "Disabled";
-				switch(frame[35]){
-					case 0:
-						reset_mode = "Disabled";
-						break;
-					case 1:
-						reset_mode = "Shift Ends";
-						break;
-					case 2:
-						reset_mode = "Timeout";
-						break;
-				}
-				let acc_odr = "10 Hz";
-				switch(frame[37]){
-					case 0:
-						acc_odr = "10 Hz";
-						break;
-					case 1:
-						acc_odr = "20 Hz";
-						break;
-					case 2:
-						acc_odr = "50 Hz";
-						break;
-					case 3:
-						acc_odr = "100 Hz";
-						break;
-					case 4:
-						acc_odr = "200 Hz";
-						break;
-					case 5:
-						acc_odr = "400 Hz";
-						break;
-				}
-				let rtc_sampling_interval = "5 sec";
-				switch(frame[36]){
-					case 0:
-						rtc_sampling_interval = "1 min";
-						break;
-					case 1:
-						rtc_sampling_interval = "5 min";
-						break;
-					case 2:
-						rtc_sampling_interval = "15 min";
-						break;
-					case 3:
-						rtc_sampling_interval = "30 min";
-						break;
-					case 4:
-						rtc_sampling_interval = "1 hour";
-						break;
-					case 5:
-						rtc_sampling_interval = "2 hours";
-						break;
-					case 6:
-						rtc_sampling_interval = "3 hours";
-						break;
-					case 7:
-						rtc_sampling_interval = "6 hours";
-						break;
-					case 8:
-						rtc_sampling_interval = "12 hours";
-						break;
-					case 9:
-						rtc_sampling_interval = "5 sec";
-						break;
-					case 10:
-						rtc_sampling_interval = "10 sec";
-						break;
-					case 11:
-						rtc_sampling_interval = "15 sec";
-						break;
-					case 12:
-						rtc_sampling_interval = "30 sec";
-						break;
-				}
-				let acc_enabled_axis = 'Disabled All';
-				switch(frame[40]){
-					case 0:
-						acc_enabled_axis = 'Disabled All';
-						break;
-					case 1:
-						acc_enabled_axis = 'x axis';
-						break;
-					case 2:
-						acc_enabled_axis = 'y axis';
-						break;
-					case 3:
-						acc_enabled_axis = 'z axis';
-						break;
-					case 7:
-						acc_enabled_axis = 'all axis';
-						break;
-				}
-				return {
-					'firmware': frame[2],
-					'accelerometer_threshold': (frame[16]* 32) + " mg",
-					'debouncing_timeout': frame.slice(17, 19).reduce(msbLsb) + " msec",
-					'accelero_state': frame[19]? "Enabled": "Disabled",
-					'counter_threshold': frame.slice(20, 24).reduce(msbLsb),
-					'trasnmit_on_change_status': frame[24]? "Enabled": "Disabled",
-					'Shift_end_1': [
-						String(frame[25]).padStart(2, '0'),
-						String(frame[26]).padStart(2, '0')
-					].join(':'),
-					'Shift_end_2': [
-						String(frame[27]).padStart(2, '0'),
-						String(frame[28]).padStart(2, '0')
-					].join(':'),
-					'Shift_end_3': [
-						String(frame[29]).padStart(2, '0'),
-						String(frame[30]).padStart(2, '0')
-					].join(':'),
-					'Shift_end_4': [
-						String(frame[31]).padStart(2, '0'),
-						String(frame[32]).padStart(2, '0')
-					].join(':'),
-					'reset_timeout': frame.slice(33, 35).reduce(msbLsb) + " min",
-					'counter_reset_mode': reset_mode,
-					'sampling_interval': rtc_sampling_interval,
-					'acc_odr': acc_odr,
-					'interrupt_timeout': frame.slice(38, 40).reduce(msbLsb) + ' msec',
-					'acc_enabled_axis': acc_enabled_axis,
-					'hardware_id': frame.slice(41, 44),
-					'report_rate': frame.slice(44, 48).reduce(msbLsb) + " sec",
-					'tx_life_counter': frame.slice(48, 52).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'accelerometer_threshold': (frame[16]* 32),
-						'debouncing_timeout': frame.slice(17, 19),
-						'accelero_state': frame[19],
-						'counter_threshold': frame.slice(20, 24),
-						'trasnmit_on_change_status': frame[24],
-						'Shift_end_1': [
-							frame[25],
-							frame[26]
-						],
-						'Shift_end_2': [
-							frame[27],
-							frame[28]
-						],
-						'Shift_end_3': [
-							frame[29],
-							frame[30]
-						],
-						'Shift_end_4': [
-							frame[31],
-							frame[32]
-						],
-						'reset_timeout': frame.slice(33, 35),
-						'counter_reset_mode': frame[35],
-						'sampling_interval': frame[36],
-						'acc_odr': frame[37],
-						'interrupt_timeout': frame.slice(38, 40),
-						'acc_enabled_axis': frame[40],
-						'hardware_id': frame.slice(41, 44),
-						'report_rate': frame.slice(44, 48),
-						'tx_life_counter': frame.slice(48, 52)
-					}
-				}
-			}
-		},
 		'120': {
 			name: 'Wireless H2S Sensor',
 			parse: (d) => {
@@ -14508,9 +14235,43 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'124': {
-			name: 'Wireless EH Flow Sensor',
+		'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',
 			parse: (d) => {
+				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
+				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
+				var dac1 = signInt(d.slice(4, 6).reduce(msbLsb));
+				return {
+					adc1: adc1,
+					adc2: adc2,
+					dac1: dac1,
+					mA1: parseFloat((adc1/100.00).toFixed(2)),
+					raw_adc: adc2,
+					raw_dac: dac1
+				};
+			}
+		},
+		'202': {
+			name: 'Wireless Weather Station',
+			parse: (payload, parsed, mac) => {
 				return {
 					Temp: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
 					Humid: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
@@ -14619,587 +14380,6 @@ function sensor_types(parent){
 				}
 			}
 		},
-		'270': {
-			name: 'Custom Salinity DO sensor',
-			parse: (d) => {
-				return {
-					sensor_status: d[0],
-					do_temperature_1: d.slice(1, 3).reduce(msbLsb) / 100,
-					do_temperature_2: d.slice(3, 5).reduce(msbLsb) / 100,
-					do_temperature_3: d.slice(5, 7).reduce(msbLsb) / 100,
-					do_temperature_4: d.slice(7, 9).reduce(msbLsb) / 100,
-					ec_temperature_1: d.slice(9, 11).reduce(msbLsb) / 100,
-					ec_temperature_2: d.slice(11, 13).reduce(msbLsb) / 100,
-					ec_temperature_3: d.slice(13, 15).reduce(msbLsb) / 100,
-					ec_temperature_4: d.slice(15, 17).reduce(msbLsb) / 100,
-					do_saturation_perc_1: d.slice(17, 19).reduce(msbLsb) / 100,
-					do_saturation_perc_2: d.slice(19, 21).reduce(msbLsb) / 100,
-					do_saturation_perc_3: d.slice(21, 23).reduce(msbLsb) / 100,
-					do_saturation_perc_4: d.slice(23, 25).reduce(msbLsb) / 100,
-					do_ppm_1: d.slice(25, 27).reduce(msbLsb) / 100,
-					do_ppm_2: d.slice(27, 29).reduce(msbLsb) / 100,
-					do_ppm_3: d.slice(29, 31).reduce(msbLsb) / 100,
-					do_ppm_4: d.slice(31, 33).reduce(msbLsb) / 100,
-					do_mgl_1: d.slice(33, 35).reduce(msbLsb) / 100,
-					do_mgl_2: d.slice(35, 37).reduce(msbLsb) / 100,
-					do_mgl_3: d.slice(37, 39).reduce(msbLsb) / 100,
-					do_mgl_4: d.slice(39, 41).reduce(msbLsb) / 100,
-					ec_conductivity_1: d.slice(41, 43).reduce(msbLsb) / 100,
-					ec_conductivity_2: d.slice(43, 45).reduce(msbLsb) / 100,
-					ec_conductivity_3: d.slice(45, 47).reduce(msbLsb) / 100,
-					ec_conductivity_4: d.slice(47, 49).reduce(msbLsb) / 100,
-					ec_salinity_ppt_1: d.slice(49, 57).reduce(msbLsb) / 100,
-					ec_salinity_ppt_2: d.slice(57, 65).reduce(msbLsb) / 100,
-					ec_salinity_ppt_3: d.slice(65, 73).reduce(msbLsb) / 100,
-					ec_salinity_ppt_4: d.slice(73, 81).reduce(msbLsb) / 100,
-					ec_tds_1: d.slice(81, 85).reduce(msbLsb) / 100,
-					ec_tds_2: d.slice(85, 89).reduce(msbLsb) / 100,
-					ec_tds_3: d.slice(89, 93).reduce(msbLsb) / 100,
-					ec_tds_4: d.slice(93, 97).reduce(msbLsb) / 100
-				};
-			},
-			'parse_fly': (frame) => {
-				let frame_data = {};
-				switch(frame[12]){
-					case 0:
-						frame_data.flow_unit = 'cm³/s';
-						break;
-					case 1:
-						frame_data.flow_unit = 'cm³/min';
-						break;
-					case 2:
-						frame_data.flow_unit = 'cm³/h';
-						break;
-					case 3:
-						frame_data.flow_unit = 'cm³/d';
-						break;
-					case 4:
-						frame_data.flow_unit = 'dm³/s';
-						break;
-					case 5:
-						frame_data.flow_unit = 'dm³/min';
-						break;
-					case 6:
-						frame_data.flow_unit = 'dm³/h';
-						break;
-					case 7:
-						frame_data.flow_unit = 'dm³/d';
-						break;
-					case 8:
-						frame_data.flow_unit = 'm³/s';
-						break;
-					case 9:
-						frame_data.flow_unit = 'm³/min';
-						break;
-					case 10:
-						frame_data.flow_unit = 'm³/h';
-						break;
-					case 11:
-						frame_data.flow_unit = 'm³/d';
-						break;
-					case 12:
-						frame_data.flow_unit = 'ml/s';
-						break;
-					case 13:
-						frame_data.flow_unit = 'ml/min';
-						break;
-					case 14:
-						frame_data.flow_unit = 'ml/h';
-						break;
-					case 15:
-						frame_data.flow_unit = 'ml/d';
-						break;
-					case 16:
-						unitStrframe_data.flow_uniting = 'l/s';
-						break;
-					case 17:
-						frame_data.flow_unit = 'l/min';
-						break;
-					case 18:
-						frame_data.flow_unit = 'l/h';
-						break;
-					case 19:
-						frame_data.flow_unit = 'l/d';
-						break;
-					case 20:
-						frame_data.flow_unit = 'hl/s';
-						break;
-					case 21:
-						frame_data.flow_unit = 'hl/min';
-						break;
-					case 22:
-						frame_data.flow_unit = 'hl/h';
-						break;
-					case 23:
-						frame_data.flow_unit = 'hl/d';
-						break;
-					case 24:
-						frame_data.flow_unit = 'Ml/s';
-						break;
-					case 25:
-						frame_data.flow_unit = 'Ml/min';
-						break;
-					case 26:
-						frame_data.flow_unit = 'Ml/h';
-						break;
-					case 27:
-						frame_data.flow_unit = 'Ml/d';
-						break;
-
-					// US Customary & Imperial Flow Rates
-					case 32:
-						frame_data.flow_unit = 'af/s';
-						break;
-					case 33:
-						frame_data.flow_unit = 'af/min';
-						break;
-					case 34:
-						frame_data.flow_unit = 'af/h';
-						break;
-					case 35:
-						frame_data.flow_unit = 'af/d';
-						break;
-					case 36:
-						frame_data.flow_unit = 'ft³/s';
-						break;
-					case 37:
-						frame_data.flow_unit = 'ft³/min';
-						break;
-					case 38:
-						frame_data.flow_unit = 'ft³/h';
-						break;
-					case 39:
-						frame_data.flow_unit = 'ft³/d';
-						break;
-					case 40:
-						frame_data.flow_unit = 'fl oz/s (us)';
-						break;
-					case 41:
-						frame_data.flow_unit = 'fl oz/min (us)';
-						break;
-					case 42:
-						frame_data.flow_unit = 'fl oz/h (us)';
-						break;
-					case 43:
-						frame_data.flow_unit = 'fl oz/d (us)';
-						break;
-					case 44:
-						frame_data.flow_unit = 'gal/s (us)';
-						break;
-					case 45:
-						frame_data.flow_unit = 'gal/min (us)';
-						break;
-					case 46:
-						frame_data.flow_unit = 'gal/h (us)';
-						break;
-					case 47:
-						frame_data.flow_unit = 'gal/d (us)';
-						break;
-					case 48:
-						frame_data.flow_unit = 'Mgal/s (us)';
-						break;
-					case 49:
-						frame_data.flow_unit = 'Mgal/min (us)';
-						break;
-					case 50:
-						frame_data.flow_unit = 'Mgal/h (us)';
-						break;
-					case 51:
-						frame_data.flow_unit = 'Mgal/d (us)';
-						break;
-					case 52:
-						frame_data.flow_unit = 'bbl/s (us;liq.)';
-						break;
-					case 53:
-						frame_data.flow_unit = 'bbl/min (us;liq.)';
-						break;
-					case 54:
-						frame_data.flow_unit = 'bbl/h (us;liq.)';
-						break;
-					case 55:
-						frame_data.flow_unit = 'bbl/d (us;liq.)';
-						break;
-					case 56:
-						frame_data.flow_unit = 'bbl/s (us;beer)';
-						break;
-					case 57:
-						frame_data.flow_unit = 'bbl/min (us;beer)';
-						break;
-					case 58:
-						frame_data.flow_unit = 'bbl/h (us;beer)';
-						break;
-					case 59:
-						frame_data.flow_unit = 'bbl/d (us;beer)';
-						break;
-					case 60:
-						frame_data.flow_unit = 'bbl/s (us;oil)';
-						break;
-					case 61:
-						frame_data.flow_unit = 'bbl/min (us;oil)';
-						break;
-					case 62:
-						frame_data.flow_unit = 'bbl/h (us;oil)';
-						break;
-					case 63:
-						frame_data.flow_unit = 'bbl/d (us;oil)';
-						break;
-					case 64:
-						frame_data.flow_unit = 'bbl/s (us;tank)';
-						break;
-					case 65:
-						frame_data.flow_unit = 'bbl/min (us;tank)';
-						break;
-					case 66:
-						frame_data.flow_unit = 'bbl/h (us;tank)';
-						break;
-					case 67:
-						frame_data.flow_unit = 'bbl/d (us;tank)';
-						break;
-					case 68:
-						frame_data.flow_unit = 'gal/s (imp)';
-						break;
-					case 69:
-						frame_data.flow_unit = 'gal/min (imp)';
-						break;
-					case 70:
-						frame_data.flow_unit = 'gal/h (imp)';
-						break;
-					case 71:
-						frame_data.flow_unit = 'gal/d (imp)';
-						break;
-					case 72:
-						frame_data.flow_unit = 'Mgal/s (imp)';
-						break;
-					case 73:
-						frame_data.flow_unit = 'Mgal/min (imp)';
-						break;
-					case 74:
-						frame_data.flow_unit = 'Mgal/h (imp)';
-						break;
-					case 75:
-						frame_data.flow_unit = 'Mgal/d (imp)';
-						break;
-					case 76:
-						frame_data.flow_unit = 'bbl/s (imp;beer)';
-						break;
-					case 77:
-						frame_data.flow_unit = 'bbl/min (imp;beer)';
-						break;
-					case 78:
-						frame_data.flow_unit = 'bbl/h (imp;beer)';
-						break;
-					case 79:
-						frame_data.flow_unit = 'bbl/d (imp;beer)';
-						break;
-					case 80:
-						frame_data.flow_unit = 'bbl/s (imp;oil)';
-						break;
-					case 81:
-						frame_data.flow_unit = 'bbl/min (imp;oil)';
-						break;
-					case 82:
-						frame_data.flow_unit = 'bbl/h (imp;oil)';
-						break;
-					case 83:
-						frame_data.flow_unit = 'bbl/d (imp;oil)';
-						break;
-					case 88:
-						frame_data.flow_unit = 'kgal/s (us)';
-						break;
-					case 89:
-						frame_data.flow_unit = 'kgal/min (us)';
-						break;
-					case 90:
-						frame_data.flow_unit = 'kgal/h (us)';
-						break;
-					case 91:
-						frame_data.flow_unit = 'kgal/d (us)';
-						break;
-					case 92:
-						frame_data.flow_unit = 'MMft³/s';
-						break;
-					case 93:
-						frame_data.flow_unit = 'MMft³/min';
-						break;
-					case 94:
-						frame_data.flow_unit = 'MMft³/h';
-						break;
-					case 96:
-						frame_data.flow_unit = 'Mft³/d';
-						break;
-				}
-				switch(frame[13]){
-					case 0:
-						frame_data.pressure_unit = 'bar';
-						break;
-					case 1:
-						frame_data.pressure_unit = 'psi a';
-						break;
-					case 2:
-						frame_data.pressure_unit = 'bar g';
-						break;
-					case 3:
-						frame_data.pressure_unit = 'psi g';
-						break;
-					case 4:
-						frame_data.pressure_unit = 'Pa a';
-						break;
-					case 5:
-						frame_data.pressure_unit = 'kPa a';
-						break;
-					case 6:
-						frame_data.pressure_unit = 'MPa a';
-						break;
-					case 7:
-						frame_data.pressure_unit = 'Pa g';
-						break;
-					case 8:
-						frame_data.pressure_unit = 'kPa g';
-						break;
-					case 9:
-						frame_data.pressure_unit = 'MPa g';
-						break;
-				}
-				switch(frame[14]){
-					case 1:
-						frame_data.conductivity_unit = 'MS/m';
-						break;
-					case 2:
-						frame_data.conductivity_unit = 'kS/m';
-						break;
-					case 3:
-						frame_data.conductivity_unit = 'S/m';
-						break;
-					case 4:
-						frame_data.conductivity_unit = 'S/cm';
-						break;
-					case 5:
-						frame_data.conductivity_unit = 'mS/m';
-						break;
-					case 6:
-						frame_data.conductivity_unit = 'mS/cm';
-						break;
-					case 7:
-						frame_data.conductivity_unit = 'μS/m';
-						break;
-					case 8:
-						frame_data.conductivity_unit = 'μS/cm';
-						break;
-					case 9:
-						frame_data.conductivity_unit = 'μS/mm';
-						break;
-					case 10:
-						frame_data.conductivity_unit = 'nS/cm';
-						break;
-				}
-
-				frame_data.totalizer_unit = [];
-
-				for (let index = 0; index < 3; index++) {
-					switch(frame[index + 15]){
-						case 0:
-							frame_data.totalizer_unit[index] = 'cm³';
-							break;
-						case 1:
-							frame_data.totalizer_unit[index] = 'dm³';
-							break;
-						case 2:
-							frame_data.totalizer_unit[index] = 'm³';
-							break;
-						case 3:
-							frame_data.totalizer_unit[index] = 'ml';
-							break;
-						case 4:
-							frame_data.totalizer_unit[index] = 'l';
-							break;
-						case 5:
-							frame_data.totalizer_unit[index] = 'hl';
-							break;
-						case 6:
-							frame_data.totalizer_unit[index] = 'Ml Mega';
-							break;
-						case 8:
-							frame_data.totalizer_unit[index] = 'af';
-							break;
-						case 9:
-							frame_data.totalizer_unit[index] = 'ft³';
-							break;
-						case 10:
-							frame_data.totalizer_unit[index] = 'fl oz (us)';
-							break;
-						case 11:
-							frame_data.totalizer_unit[index] = 'gal (us)';
-							break;
-						case 12:
-							frame_data.totalizer_unit[index] = 'Mgal (us)';
-							break;
-						case 13:
-							frame_data.totalizer_unit[index] = 'bbl (us;liq.)';
-							break;
-						case 14:
-							frame_data.totalizer_unit[index] = 'bbl (us;beer)';
-							break;
-						case 15:
-							frame_data.totalizer_unit[index] = 'bbl (us;oil)';
-							break;
-						case 16:
-							frame_data.totalizer_unit[index] = 'bbl (us;tank)';
-							break;
-						case 17:
-							frame_data.totalizer_unit[index] = 'gal (imp)';
-							break;
-						case 18:
-							frame_data.totalizer_unit[index] = 'Mgal (imp)';
-							break;
-						case 19:
-							frame_data.totalizer_unit[index] = 'bbl (imp;beer)';
-							break;
-						case 20:
-							frame_data.totalizer_unit[index] = 'bbl (imp;oil)';
-							break;
-						case 22:
-							frame_data.totalizer_unit[index] = 'kgal (us)';
-							break;
-						case 23:
-							frame_data.totalizer_unit[index] = 'Mft³';
-							break;
-					}
-					
-				}
-				return {
-					'firmware': frame[2],
-					'flow_unit': frame_data.flow_unit,
-					'pressure_unit': frame_data.pressure_unit,
-					'conductivity_unit': frame_data.conductivity_unit,
-					'totalizer_1_unit': frame_data.totalizer_unit[0],
-					'totalizer_2_unit': frame_data.totalizer_unit[1],
-					'totalizer_3_unit': frame_data.totalizer_unit[2],
-					'hardware_id': frame.slice(18, 21),
-					'sample_rate': frame.slice(21, 25).reduce(msbLsb),
-					'tx_life_counter': frame.slice(25, 29).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'flow_unit': frame[12],
-						'pressure_unit': frame[13],
-						'conductivity_unit': frame[14],
-						'totalizer_1_unit': frame[15],
-						'totalizer_2_unit': frame[16],
-						'totalizer_3_unit': frame[17],
-						'hardware_id': frame.slice(18, 21),
-						'sample_rate': frame.slice(21, 25),
-						'tx_life_counter': frame.slice(25, 29)
-					}
-				}
-			}
-		},
-		'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',
-			parse: (d) => {
-				var adc1 = signInt(d.slice(0, 2).reduce(msbLsb));
-				var adc2 = signInt(d.slice(2, 4).reduce(msbLsb));
-				var dac1 = signInt(d.slice(4, 6).reduce(msbLsb));
-				return {
-					adc1: adc1,
-					adc2: adc2,
-					dac1: dac1,
-					mA1: parseFloat((adc1/100.00).toFixed(2)),
-					raw_adc: adc2,
-					raw_dac: dac1
-				};
-			}
-		},
-		'202': {
-			name: 'Wireless Weather Station',
-			parse: (payload, parsed, mac) => {
-				return {
-					Temp: signInt(payload.slice(8, 12).reduce(msbLsb), 32) / 100,
-					Humid: signInt(payload.slice(12, 16).reduce(msbLsb), 32) / 100,
-					Pressure: signInt(payload.slice(16, 20).reduce(msbLsb), 32) / 100,
-					WindSpd: signInt(payload.slice(20, 24).reduce(msbLsb),32) / 100,
-					WindDir: signInt(payload.slice(24, 28).reduce(msbLsb),32) / 100,
-					reserve: payload[7]
-				};
-			}
-		},
-		'211': {
-			name: 'DO and Flow Sensor',
-			parse: (payload, parsed, mac) => {
-				if(payload[0] == 0){ // regular
-					return {
-						msg_type: 'regular',
-						temperature: signInt(payload.slice(1, 3).reduce(msbLsb), 16),
-						oxygen_saturation_percent: payload.slice(3, 7).reduce(msbLsb),
-						oxygen_ppm: payload.slice(7, 11).reduce(msbLsb),
-						oxygen_mg_l: payload.slice(11, 15).reduce(msbLsb)
-					};
-				}
-				else{ // theshold
-					let solenoid_status = payload[2];
-					if(solenoid_status == 1){ // Solenoid On
-						return {
-							msg_type: 'threshold',
-							solenoid_number: payload[1],
-							solenoid_status: 'on',
-							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
-							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
-							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
-							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb),
-							flow_rate: payload.slice(17, 21).reduce(msbLsb)
-						};
-					} else{ // Solenoid Off
-						return {
-							msg_type: 'threshold',
-							solenoid_number: payload[1],
-							solenoid_status: 'off',
-							temperature: signInt(payload.slice(3, 5).reduce(msbLsb), 16),
-							oxygen_saturation_percent: payload.slice(5, 9).reduce(msbLsb),
-							oxygen_ppm: payload.slice(9, 13).reduce(msbLsb),
-							oxygen_mg_l: payload.slice(13, 17).reduce(msbLsb)
-						};
-					}
-				}
-			},
-			'parse_fly': (frame) => {
-				return {
-					'firmware': frame[2],
-					'hardware_id': frame.slice(12, 15),
-					'report_rate': frame.slice(15, 19).reduce(msbLsb) + "Sec",
-					'tx_life_counter': frame.slice(19, 23).reduce(msbLsb),
-					'machine_values': {
-						'firmware': frame[2],
-						'hardware_id': frame.slice(12, 15),
-						'report_rate': frame.slice(15, 19),
-						'tx_life_counter': frame.slice(19, 23)
-					}
-				}
-			}
-		},
-		'217': {
-			name: 'Wireless Weight Scale',
-			parse: (d) => {
-				return {
-					weight: signInt(d.slice(0, 4).reduce(msbLsb)) / 100
-				};
-			}
-		},
 		'270': {
 			name: 'Custom Salinity DO sensor',
 			parse: (d) => {

package/package.json

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

package/wireless.html

@@ -2688,24 +2688,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-108 data-sensor-119>
-				<div class="form-row ncd-active-check">
-					<strong>Enable Accelerometer</strong>
-					<p class="caption">
-						This setting toggles the accelerometer sensor on or off. Disabling it is recommended for applications that does not require accelerometer.
-					</p>
-					<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">Disabled</option>
-							<option value="1" selected>Enabled</option>
-						</select>
-					</div>
-				</div>
+			<div class="ncd-dependent" data-sensor-108>
 				<div class="form-row ncd-active-check">
 					<strong>Enable Accelerometer</strong>
 					<p class="caption">
@@ -2740,20 +2723,6 @@
 						</select>
 					</div>
 				</div>
-				<div class="form-row ncd-active-check">
-					<strong>Set Accelerometer Threshold</strong>
-					<p class="caption">
-						Sets the threshold in multiples of 32mg in which an uptime will be detected. A value of 1 = 32mg, a value of 2 = 64mg etc.
-					</p>
-					<div>
-						<label for="node-input-accelerometer_threshold_108_active">Active:</label>
-						<input type="checkbox" id="node-input-accelerometer_threshold_108_active" class="ncd-config-toggle" data-target-id="node-input-accelerometer_threshold_108" value="1">
-					</div>
-					<div>
-						<label for="node-input-accelerometer_threshold_108"><i class="icon-tag"></i>Value:</label>
-						<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-119>
 				<div class="form-row ncd-active-check">
@@ -3606,7 +3575,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="ncd-dependent" data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114 data-sensor-543>
+			<div class="ncd-dependent" data-sensor-110 data-sensor-111 data-sensor-112 data-sensor-114>
 				<div class="form-row ncd-active-check">
 					<strong>Probe 1: Sampling Duration</strong>
 					<p>