Incorporated custom Kelvin value

From: antoinelamy@098f2aa4c5358ce19dad ce1f35b0b7af2632737f It’s a shame our Forks have diverged as much as they have.
kylehowells · Jun 3, 2015 · 4f50055 · 4f50055 · antoinelamy · Jun 3, 2015
1 parent 08da387
commit 4f50055
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 14 deletions.
diff --git a/HAPAccessoryKit Headers/HAKCharacteristic.h b/HAPAccessoryKit Headers/HAKCharacteristic.h
@@ -9,6 +9,38 @@
 
 @class HAKService, HAKUUID, HAKValueConstraints, NSArray, NSHashTable, NSNumber,  NSString;
 
+typedef NS_ENUM(NSUInteger, HAKCharacteristicFormat) {
+	HAKCharacteristicFormatNone,
+	HAKCharacteristicFormatBool,
+	HAKCharacteristicFormatInt,
+	HAKCharacteristicFormatUInt8,
+	HAKCharacteristicFormatUInt16,
+	HAKCharacteristicFormatUInt32,
+	HAKCharacteristicFormatUInt64,
+	HAKCharacteristicFormatFloat,
+	HAKCharacteristicFormatString,
+	HAKCharacteristicFormatDate,
+	HAKCharacteristicFormatTLV8,
+	HAKCharacteristicFormatData,
+	HAKCharacteristicFormatArray,
+	HAKCharacteristicFormatDictionary
+};
+
+typedef NS_ENUM(NSUInteger, HAKCharacteristicUnit) {
+	HAKCharacteristicUnitNone,
+	HAKCharacteristicUnitCelcius,
+	HAKCharacteristicUnitPercentage,
+	HAKCharacteristicUnitArcDegrees
+};
+
+typedef NS_OPTIONS(NSUInteger, HAKCharacteristicPermission) {
+	HAKCharacteristicPermissionReadable = 1 << 0,
+	HAKCharacteristicPermissionWritable = 1 << 1,
+	HAKCharacteristicPermissionUpdatable = 1 << 2,
+};
+
+
+
 @interface HAKCharacteristic : NSObject <NSCoding, NSCopying>
 {
     id _value;
@@ -31,9 +63,9 @@
 @property(retain, nonatomic) NSHashTable *subscribedConnectionsTable; // @synthesize subscribedConnectionsTable=_subscribedConnectionsTable;
 @property(retain, nonatomic) dispatch_queue_t workQueue; // @synthesize workQueue=_workQueue;
 @property(copy, nonatomic) HAKValueConstraints *constraints; // @synthesize constraints=_constraints;
-@property(nonatomic) unsigned long long unit; // @synthesize unit=_unit;
-@property(readonly, nonatomic) unsigned long long format; // @synthesize format=_format;
-@property(nonatomic) unsigned long long permissions; // @synthesize permissions=_permissions;
+@property(nonatomic) HAKCharacteristicUnit unit; // @synthesize unit=_unit;
+@property(readonly, nonatomic) HAKCharacteristicFormat format; // @synthesize format=_format;
+@property(nonatomic) HAKCharacteristicPermission permissions; // @synthesize permissions=_permissions;
 @property(readonly, nonatomic) unsigned long long properties; // @synthesize properties=_properties;
 @property(copy, nonatomic) NSString *manufacturerDescription; // @synthesize manufacturerDescription=_manufacturerDescription;
 @property(copy, nonatomic) NSNumber *instanceID; // @synthesize instanceID=_instanceID;

diff --git a/HomeKitBridge/LIFX/HKBLightAccessoryLIFX.m b/HomeKitBridge/LIFX/HKBLightAccessoryLIFX.m
@@ -6,13 +6,16 @@
 //  Copyright (c) 2014 Kyle Howells. All rights reserved.
 //
 
+#import "HAKNumberConstraints.h"
 #import "HKBLightAccessoryLIFX.h"
 
 #import <LIFXKit/LIFXKit.h>
 #import "HKBLightAccessory+Subclass.h"
 
 @interface HKBLightAccessoryLIFX () <LFXLightObserver>
 @property (nonatomic, strong) LFXLight *lifxBulb;
+
+@property (nonatomic, strong) HAKCharacteristic *kelvinCharacteristic;
 @end
 
 
@@ -51,14 +54,26 @@ -(instancetype)initWithLightBulb:(LFXLight*)lightBulb{
 
 
 // TODO: work out how to define custom characteristics and add the kelvin value of LIFX bulbs
-//-(void)setupServices{
-//	[super setupServices];
-//
-//	HAKIntegerCharacteristic *kelvin = [[HAKIntegerCharacteristic alloc] init];
-//	kelvin.minimumValue = [NSNumber numberWithInt:LFXHSBKColorMinKelvin];
-//	kelvin.maximumValue = [NSNumber numberWithInt:LFXHSBKColorMaxKelvin];
-//	[self.lightBulbService addCharacteristic:kelvin];
-//}
+-(void)setupServices{
+	[super setupServices];
+
+	_kelvinCharacteristic = [[HAKCharacteristic alloc] initWithType:[HAKUUID UUIDWithUUIDString:@"0836D660-26E5-4D17-A714-A15DB6EAC9A5"] properties:11 format:HAKCharacteristicFormatUInt16];
+	HAKNumberConstraints *kelvinConstraints = [[HAKNumberConstraints alloc] initWithMinimumValue:@(LFXHSBKColorMinKelvin) maximumValue:@(LFXHSBKColorMaxKelvin)];
+	_kelvinCharacteristic.constraints = kelvinConstraints;
+
+	[self.lightBulbService addCharacteristic:_kelvinCharacteristic];
+}
+
+-(void)characteristicDidUpdateValue:(HAKCharacteristic*)characteristic
+{
+	[super characteristicDidUpdateValue:characteristic];
+
+	if (characteristic == self.kelvinCharacteristic) {
+		[self updateExternalKelvin:[characteristic.value unsignedIntValue]];
+	}
+
+	//if (characteristic.service == self.lightBulbService) {}
+}
 
 
 
@@ -82,6 +97,10 @@ -(void)light:(LFXLight *)light didChangePowerState:(LFXPowerState)powerState{
 
 #pragma mark - Update HomeKit to LIFX values
 
+-(void)updateHKPowerState{
+	[self updateHomeKitPowerState:(self.lifxBulb.powerState == LFXPowerStateOn)];
+}
+
 -(void)updateHKColorValues{
 	// - Conversion:	LIFX		HomeKit
 	// hue;			//	[0, 360] -  [0, 360]
@@ -91,11 +110,17 @@ -(void)updateHKColorValues{
 	[self updateHomeKitBrightness:(self.lifxBulb.color.brightness * 100)];
 	[self updateHomeKitSaturation:(self.lifxBulb.color.saturation * 100)];
 	[self updateHomeKitHue:self.lifxBulb.color.hue];
-}
--(void)updateHKPowerState{
-	[self updateHomeKitPowerState:(self.lifxBulb.powerState == LFXPowerStateOn)];
+
+	[self updateHomeKitKelvin:self.lifxBulb.color.kelvin];
 }
 
+-(void)updateHomeKitKelvin:(NSUInteger)kelvin{
+	HAKCharacteristic *characteristic = self.kelvinCharacteristic;
+
+	if ([characteristic.constraints validateValue:@(kelvin)]) {
+		characteristic.value = @(kelvin);
+	}
+}
 
 
 
@@ -138,6 +163,15 @@ -(void)updateExternalHue:(NSInteger)hue{
 	[lfxLight setColor:newColor];
 }
 
+-(void)updateExternalKelvin:(uint16_t)kelvin{
+	LFXLight *lfxLight = [self lifxBulb];
+
+	LFXHSBKColor *currentColor = [lfxLight color];
+	LFXHSBKColor *newColor = [LFXHSBKColor colorWithHue:currentColor.hue saturation:currentColor.saturation brightness:currentColor.brightness kelvin:kelvin];
+
+	[lfxLight setColor:newColor];
+}
+