Fixed SimpleControls OSX App.

Author: Cheong2K

Examples/SimpleControls_OSX/SimpleControls/AppDelegate.h

@@ -1,10 +1,15 @@
-//
-//  AppDelegate.h
-//  SimpleControls
-//
-//  Created by Cheong on 27/10/12.
-//  Copyright (c) 2012 RedBearLab. All rights reserved.
-//
+
+/*
+ 
+ Copyright (c) 2013-2014 RedBearLab
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ */
 
 #import <Cocoa/Cocoa.h>
 #import "BLE.h"

Examples/SimpleControls_OSX/SimpleControls/AppDelegate.m

@@ -1,10 +1,15 @@
-//
-//  AppDelegate.m
-//  SimpleControls
-//
-//  Created by Cheong on 27/10/12.
-//  Copyright (c) 2012 RedBearLab. All rights reserved.
-//
+
+/*
+ 
+ Copyright (c) 2013-2014 RedBearLab
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ */
 
 #import "AppDelegate.h"
 
@@ -15,12 +20,16 @@ @implementation AppDelegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     ble = [[BLE alloc] init];
-    [ble controlSetup:1];
+    [ble controlSetup];
     ble.delegate = self;
 }
 
 - (BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)application
 {
+    if (ble.activePeripheral)
+        if(ble.activePeripheral.isConnected)
+            [[ble CM] cancelPeripheralConnection:[ble activePeripheral]];
+    
     return YES;
 }
 
@@ -72,14 +81,14 @@ -(void) bleDidReceiveData:(unsigned char *)data length:(int)length
     {
         NSLog(@"0x%02X, 0x%02X, 0x%02X", data[i], data[i+1], data[i+2]);
 
-        if (data[i] == 0x0A)
+        if (data[i] == 0x0A) // Digital In data
         {
             if (data[i+1] == 0x01)
                 lblDigitalIn.stringValue = @"HIGH";
             else
                 lblDigitalIn.stringValue = @"LOW";
         }
-        else if (data[i] == 0x0B)
+        else if (data[i] == 0x0B) // Analog In data
         {
             UInt16 Value;
 
@@ -96,6 +105,8 @@ -(void) bleDidUpdateRSSI:(NSNumber *) rssi
 
 - (IBAction)btnConnect:(id)sender
 {
+    NSLog(@"Clicked");
+    
     if (ble.activePeripheral)
         if(ble.activePeripheral.isConnected)
         {

Examples/SimpleControls_OSX/SimpleControls/BLE/BLE.h

@@ -1,21 +1,21 @@
 
 /*
  
- Copyright (c) 2012 RedBearLab
+ Copyright (c) 2013-2014 RedBearLab
  
  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
  
  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
  
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  
-*/
+ */
 
 #import <Foundation/Foundation.h>
 #if TARGET_OS_IPHONE
-    #import <CoreBluetooth/CoreBluetooth.h>
+#import <CoreBluetooth/CoreBluetooth.h>
 #else
-    #import <IOBluetooth/IOBluetooth.h>
+#import <IOBluetooth/IOBluetooth.h>
 #endif
 
 @protocol BLEDelegate
@@ -40,19 +40,16 @@
 -(void) read;
 -(void) writeValue:(CBUUID *)serviceUUID characteristicUUID:(CBUUID *)characteristicUUID p:(CBPeripheral *)p data:(NSData *)data;
 
--(UInt16) readLibVer;
--(UInt16) readFrameworkVersion;
--(NSString *) readVendorName;
 -(BOOL) isConnected;
--(int) readRSSI;
 -(void) write:(NSData *)d;
+-(void) readRSSI;
 
--(int) controlSetup:(int) s;
+-(void) controlSetup;
 -(int) findBLEPeripherals:(int) timeout;
 -(void) connectPeripheral:(CBPeripheral *)peripheral;
 
 -(UInt16) swap:(UInt16) s;
--(const char *) centralManagerStateToString:(long)state;
+-(const char *) centralManagerStateToString:(int)state;
 -(void) scanTimer:(NSTimer *)timer;
 -(void) printKnownPeripherals;
 -(void) printPeripheralInfo:(CBPeripheral*)peripheral;
@@ -61,11 +58,13 @@
 -(void) getAllCharacteristicsFromPeripheral:(CBPeripheral *)p;
 -(CBService *) findServiceFromUUID:(CBUUID *)UUID p:(CBPeripheral *)p;
 -(CBCharacteristic *) findCharacteristicFromUUID:(CBUUID *)UUID service:(CBService*)service;
--(const char *) UUIDToString:(CFUUIDRef) UUID;
--(const char *) CBUUIDToString:(CBUUID *) UUID;
+
+//-(NSString *) NSUUIDToString:(NSUUID *) UUID;
+-(NSString *) CBUUIDToString:(CBUUID *) UUID;
+
 -(int) compareCBUUID:(CBUUID *) UUID1 UUID2:(CBUUID *)UUID2;
 -(int) compareCBUUIDToInt:(CBUUID *) UUID1 UUID2:(UInt16)UUID2;
 -(UInt16) CBUUIDToInt:(CBUUID *) UUID;
--(int) UUIDSAreEqual:(CFUUIDRef)u1 u2:(CFUUIDRef)u2;
+-(BOOL) UUIDSAreEqual:(NSUUID *)UUID1 UUID2:(NSUUID *)UUID2;
 
 @end