Add files via upload

Author: jvmahon

lib/DataExchange.js

@@ -6,7 +6,7 @@ var promiseHTTP = require("request-promise-native");
 
 
 
-exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic, forceHSValue, getHSValue, instantStatusEnabled, that)
+exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic, forceHSValue, getHSValue, instantStatusEnabled, that )
 {
 		var url;
 		var error = null;
@@ -29,6 +29,20 @@ exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic
 			// Uncomment any UUID's actually used!
 				switch( that.UUID)
 				{
+					case(Characteristic.SecuritySystemTargetState.UUID):
+					{
+						// For now, this assumes HomeSeer users same indicator values as HomeKit
+						// This may not be a valid assumption and may need to use configuration parameters to vary this.
+						switch (level)
+						{
+						case 0: { transmitValue = that.config.armStayValue; break; }// 0 = HomeKit Stay Arm
+						case 1: { transmitValue = that.config.armAwayValue; break; } // 1 = HomeKit Away Arm
+						case 2: { transmitValue = that.config.armNightValue; break; } // 2 = HomeKit Night Arm
+						case 3: { transmitValue = that.config.disarmValue; break; } // 3 = HomeKit Disarmed
+
+						};
+						break;
+					}
 					case(Characteristic.TargetRelativeHumidity.UUID):
 					{
 						transmitValue = level;
@@ -63,10 +77,9 @@ exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic
 
 					case(Characteristic.TargetPosition.UUID):
 					{
-						// if a simple binary switch is used, then either fully open or fully closed! 
 						if (that.config.binarySwitch)
 						{
-							transmitValue = (level < 50) ? 0 : 255; // Turn to "on"
+							transmitValue = (level < 50) ? that.config.closedValue : that.config.openValue; // Turn to "on"
 							forceHSValue(that.HSRef, transmitValue); 
 						} 
 						else
@@ -124,11 +137,12 @@ exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic
 						console.log("Set TransmitValue for lock characteristic %s to %s ", that.displayName, transmitValue);
 						break;
 					}
+					
 
 					case(Characteristic.On.UUID ):  
 					{
 						// For devices such as dimmers, HomeKit sends both "on" and "brightness" when you adjust brightness.
-						// But Z-Wave only expects a brighness value if light is already on. So, if the device is already on (non-Zero ZWave value)
+						// But Z-Wave only expects a brightness value if light is already on. So, if the device is already on (non-Zero ZWave value)
 						// then don't send again.
 						// HomeKit level == false means turn off, level == true means turn on.
 
@@ -193,23 +207,7 @@ exports.sendToHomeSeer = function (level, callback, HomeSeerHost, Characteristic
 						// console.log(that.displayName + ': HomeSeer setHSValue function succeeded!');
 						callback(null);
 						// updateCharacteristic(this);// poll for this one changed Characteristic after setting its value.
-						
-					// Strange special case of extra poll needed for window coverings that are controlled by a binary switch.
-					// For odd reason, if poll isn't done, then the icon remains in a changing state until next poll!
-					if (that.UUID == Characteristic.CurrentPosition.UUID || that.UUID == Characteristic.TargetPosition.UUID)
-					{
-							setTimeout ( ()=>
-							{
-								// console.log(chalk.cyan.bold("Window Covering Extra Polling!"));
-								var statusObjectGroup = _statusObjects[that.HSRef];
-								for (var thisCharacteristic in statusObjectGroup)
-								{
-									updateCharacteristicFromHSData(statusObjectGroup[thisCharacteristic]);
-								}
-							}, 500);
-					} 
-			
-			
+									
 				}.bind(this))
 				.catch(function(err)
 					{ 	
@@ -240,6 +238,36 @@ exports.processDataFromHomeSeer = function (characteristicObject, that, Characte
 
 		switch(true)
 		{
+			case(characteristicObject.UUID == Characteristic.SecuritySystemTargetState.UUID):
+			case(characteristicObject.UUID == Characteristic.SecuritySystemCurrentState.UUID):
+			{
+				// For now, this assumes HomeSeer users same indicator values as HomeKit
+				// This may not be a valid assumption and may need to use configuration parameters to vary this.
+				switch (true)
+				{
+				case (characteristicObject.config.armedStayValues.indexOf(newValue) != (-1)): 
+					{ characteristicObject.updateValue(0); break; } // 0 = HomeKit Stay Arm
+					
+				case (characteristicObject.config.armedAwayValues.indexOf(newValue) != (-1)):
+					{ characteristicObject.updateValue(1); break; } // 1 = HomeKit Away Arm
+					
+				case (characteristicObject.config.armedNightValues.indexOf(newValue) != (-1)):
+					{ characteristicObject.updateValue(2); break; } // 2 = HomeKit Night Arm
+					
+				case (characteristicObject.config.disarmedValues.indexOf(newValue) != (-1)):
+					{ characteristicObject.updateValue(3); break; } // 3 = HomeKit Disarmed
+					
+				case (characteristicObject.config.alarmValues.indexOf(newValue) != (-1)): 
+					{ 
+						// Don't update the 'target' state if its an Alarm!
+						if(characteristicObject.UUID != Characteristic.SecuritySystemTargetState.UUID)
+							characteristicObject.updateValue(4); // 4 = HomeKit Alarm Triggered
+						break; 
+					} 
+				};
+				break;
+			}
+		
 			case(characteristicObject.UUID == Characteristic.StatusLowBattery.UUID):
 			{
 				// that.log("Battery Threshold status of battery level %s with threshold %s", newValue, characteristicObject.batteryThreshold);
@@ -253,14 +281,37 @@ exports.processDataFromHomeSeer = function (characteristicObject, that, Characte
 			{
 				if ((newValue > 100) && (newValue < 255))
 				{	
-				console.log(chalk.bold.red("** Warning - Possible Illegal value for window covering setting"));
+					console.log(chalk.bold.red("** Warning - Possible Illegal value for window covering setting"));
 				}
 
-				// console.log(chalk.bold.magenta("Updating Characteristic: " + characteristicObject.displayName + " to value " + ((newValue == 255) ? 100 : newValue)  ));
+				// console.log(chalk.bold.magenta("Updating Characteristic: " + characteristicObject.displayName + " using received value: " + newValue));
 
 				// If you get a value of 255, then its probably from a binary switch, so set as fully open.
 				// Else, its from a percentage-adjustable shade, so set to the percentage.
-				characteristicObject.updateValue( ( ((newValue == 255) || (newValue == 99)) ? 100 : newValue) );	
+				if(characteristicObject.config.binarySwitch)
+				{
+					switch(newValue)
+					{
+						case (characteristicObject.config.openValue):
+							{characteristicObject.updateValue(100); break;}
+						case (characteristicObject.config.closedValue):
+							{characteristicObject.updateValue(0); break;}
+						default:
+						{
+							console.log(chalk.magenta.red(
+							"** Warning - Possible Illegal value for window covering setting. " + 
+							"Window covering is set as a binary (open/closed) covering but HomeSeer returned value: " + newValue +
+							" which is not the openValue or closedValue.  Treating the value as 'closed'"
+							));
+							characteristicObject.updateValue(0)
+							break;
+						}
+					}
+				}
+				else
+				{
+					characteristicObject.updateValue( ( (newValue == 99) ? 100 : newValue) );
+				}				
 				break;
 
 			}