Permalink
Browse files

Merge branch 'master' of https://github.com/ka010/MWKit

  • Loading branch information...
2 parents 414a895 + 3c64e11 commit b7cb45984a57f60f9cd72e9611f75d46eeeb9934 Kai Aras committed Jun 24, 2012
Showing with 11 additions and 14 deletions.
  1. +1 −1 MWKit.xcodeproj/project.pbxproj
  2. +7 −1 MWKit/MWCoreBluetoothController.h
  3. +1 −11 MWKit/MWCoreBluetoothController.m
  4. +2 −1 MWKit/MWKit.h
@@ -163,7 +163,6 @@
4E8FB05B1427247C005854AA = {
isa = PBXGroup;
children = (
- 4EBFC6AD1582F3A900502723 /* CoreBluetooth.framework */,
4E96A08F142AA90900CFAA5F /* Shared */,
4E8FB0701427247C005854AA /* MWKit */,
4E96A0431429F5C100CFAA5F /* MWKitMobile */,
@@ -184,6 +183,7 @@
4E8FB0691427247C005854AA /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 4EBFC6AD1582F3A900502723 /* CoreBluetooth.framework */,
4E6A115F142CB91F00B025C0 /* CoreGraphics.framework */,
4E6A116C142CC02E00B025C0 /* QuartzCore.framework */,
4E8A4BA2143542ED008CDA90 /* libBTstack.dylib */,
@@ -16,7 +16,13 @@
@interface MWCoreBluetoothController : MWConnectionController<CBCentralManagerDelegate, CBPeripheralDelegate> {
-
+ CBCentralManager *_manager;
+ CBPeripheral *_device;
+ CBService *_service;
+ CBDescriptor *_descriptor;
+
+ BOOL _pendingInit;
+ BOOL _LEAvailable;
}
+(MWCoreBluetoothController *) sharedController;
@@ -11,17 +11,7 @@
#include "crc16ccitt.h"
-@interface MWCoreBluetoothController () {
- CBCentralManager *_manager;
- CBPeripheral *_device;
- CBService *_service;
- CBDescriptor *_descriptor;
-
- BOOL _pendingInit;
- BOOL _LEAvailable;
-}
-
-
+@interface MWCoreBluetoothController ()
-(void)_startDiscovery;
@end
View
@@ -16,9 +16,10 @@
#import "MWSerialPortController.h"
#else
#import "MWBTStackController.h"
-#import "MWCoreBluetoothController.h"
#endif
+#import "MWCoreBluetoothController.h"
+
#define MWKitDidOpenChannelNotification @"didOpenChannel"
#define MWKitDidCloseChannelNotification @"didCloseChannel"
#define MWKitDidReceiveData @"didReceiveData"

0 comments on commit b7cb459

Please sign in to comment.