diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..496ee2c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store \ No newline at end of file diff --git a/4up image.jpg b/4up image.jpg old mode 100755 new mode 100644 diff --git a/CHANGELOG b/CHANGELOG index c661f95..3611110 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,33 @@ CHANGELOG +v 2.3.3 + - Enable C++11 support (thanks focalintent) + - Fix Print::printf("%f") with correct digits (thanks ShenggaoZhu) + - Added radioActive check to flashPageErase + +v 2.3.2 + - Fixes required to support Arduino 1.6.6 + - Updated to the latest RFDLoaders + - Use the RFDLoaders in the RFduino directory (instead of installing seperately in tools) + +v 2.3.1 + - RFduino linux native support (test install on Ubuntu 14.04 32bit & 64bit, Fedora 21, + OpenSUSE 13.2) + - Created http://github.com/RFduino/RFduinoApps repository for separate installation + of projects/previews/demos. Separate installation should make finding them easier. + - Moved iPhone Apps folder to RFduinoApps repository. + - Added Raspberry PI folder to RFduinoApps to demonstrate Raspberry PI & RFduino + integration. + +v 2.3 + - Fixes required to support Arduino 1.6.3 + (NOTE: Arduino 1.6.3 or higher is now required for RFduino 2.3 or above). + - Include explicit information about Java 6 (thanks gortok) + - fixing analogRead freeze problem + fixing indentation (thanks OrenLederman) + - Removing deprecated field in iOS framework and sample projects (thanks SensiBots) + - make these virtual (thanks tripzero) + - Remove dependence on UIKit; fix use of deprecated UUID attribute (thanks aeberbach) + v 2.2.4 - Reduce compile times with Arduino 1.6 on second and subsequent compiles. diff --git a/README.md b/README.md old mode 100755 new mode 100644 index cdb4b5c..6964b68 --- a/README.md +++ b/README.md @@ -4,35 +4,59 @@ [Video](http://www.youtube.com/watch?v=arWBdGwCJcM) +## Communicating with us + +The best way to communiate with us is on the [RFduino Forum](http://forum.RFduino.com). + ## Installation * Get the [RFduino hardware](http://RFduino.com). -* Download [Arduino 1.5](http://arduino.cc/en/Main/Software). - * _If you're on OSX_: Remember to open Arduino _first_ to make gatekeeper perform its magic! +* Install the [FTDI drivers](http://www.ftdichip.com/Drivers/VCP.htm). + +* Download [Arduino 1.6.6](http://arduino.cc/en/Main/Software) or newer. + * _Mac OS X_: Requires Java 6 to be installed. Available [here](https://support.apple.com/kb/DL1572?locale=en_US). + * Note: The default Package in Ubuntu 16.04 is to old 1.5.3 and does not support adding hardware support. -* Copy the Arduino library into the appropriate directory for your system. (Folder should be named ```RFduino```, not ```RFduino-master```): - ![location](docs.png) - * _Windows_: - * ```C:\arduino-1.5.4\hardware\arduino``` - * _OSX, Arduino 1.5.8_: - * ```/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino``` +* Open Arduino + * Edit Preferences, and add ```http://rfduino.com/package_rfduino166_index.json``` to Additional Board Manager URLs and save. + ![preferences](preferences.png) + * Open the Boards Manager under ```Tools->Board``` menu. + * Select the RFduino package at the end of the list, and click Install to install it. + * Your new board will now show up in the ```Tools->Board``` menu. -* Install the [FTDI drivers](http://www.ftdichip.com/Drivers/VCP.htm). +Select the board and port, and you're ready to go! + +Note: Arduino may not start properly if another version has been previously installed and the Preferences are incompatible. You can reset the Preferences by deleting the following directory: +* _Windows_: %appdata%/Arduino15 (open File Explorer, enter %appdata% into the Address Bar and press Enter) +* _Mac OS X_: ~/Library/Arduino15 (open Finder, and ```Go->Go to Folder```) +* _Linux_: ~/.arduino15 + +## Linux -You're ready to go! +``` +// FTDI drivers are not needed (they are built into the kernel) -Detailed instructions are available in our [Quick Start Guide](http://files.rfdigital.com/rfduino.quick.start.guide.pdf). +wget http://downloads.arduino.cc/arduino-1.6.6-linux64.tar.xz +tar -xf arduino-1.6.6-linux64.tar.xz + +Ubuntu: sudo apt-get install default-jre +Fedora: sudo yum install jre +OpenSUSE: sudo zypper install jre + +// otherwise the com port open will fail with permission denied (you must logout/login for change to take effect) +sudo usermod -aG dialout +``` ## Getting Started * Attach the USB shield -* Select RFduino from the ```Tools/Board``` menu +* Select RFduino from the ```Tools->Board``` menu -* Select the port from the ```Tools/Port``` menu +* Select the port from the ```Tools->Port``` menu -* Select an example from the ```Files/Examples/RFduinoNonBLE``` or ```Files/Examples/RFduinoBLE``` directory +* Select an example from the ```File->Examples->RFduinoNonBLE``` or ```File->Examples-?RFduinoBLE``` directory * Select ```Upload``` to compile, upload and execute the sketch @@ -40,16 +64,6 @@ Detailed instructions are available in our [Quick Start Guide](http://files.rfdi * Detailed instructions for the Temperature app are available [here](http://files.rfdigital.com/rfduino.temperature.guide.pdf). * Detailed instructions for the ColorWheel app are available [here](http://files.rfdigital.com/rfduino.rgb.colorwheel.guide.pdf). -# Communicating with us - -The best way to communiate with us is on the [RFduino Forum](http://forum.RFduino.com). - -### A Lot More Coming! - -We are working on documentation as fast as we can. Until then, the best source for documentation is the sketch examples. - -This project has been a huge success, and we have many exciting things planned that we want to share with the community. At the same time, we are unbelievable busy, with a ton going on and lots of small items to clean up. We are just a small team working on this project ... please bear with us! - -We hope you enjoy creating stuff with your RFduino as much as we do! +## RFduinoApps -The RFduino team. +Check out the [RFduinoApps](http://github.com/RFduino/RFduinoApps) repository for iPhone App source code & RFduino to Raspberry Pi integration projects. diff --git a/RFDLoader b/RFDLoader deleted file mode 100755 index 992224a..0000000 Binary files a/RFDLoader and /dev/null differ diff --git a/RFDLoader.exe b/RFDLoader.exe old mode 100755 new mode 100644 index b22d8d3..39fd02e Binary files a/RFDLoader.exe and b/RFDLoader.exe differ diff --git a/RFDLoader32 b/RFDLoader32 deleted file mode 100644 index bd41c16..0000000 Binary files a/RFDLoader32 and /dev/null differ diff --git a/RFDLoader32_linux b/RFDLoader32_linux new file mode 100755 index 0000000..71553f9 Binary files /dev/null and b/RFDLoader32_linux differ diff --git a/RFDLoader32_osx b/RFDLoader32_osx new file mode 100755 index 0000000..bbca309 Binary files /dev/null and b/RFDLoader32_osx differ diff --git a/RFDLoader_linux b/RFDLoader_linux new file mode 100755 index 0000000..c5113a3 Binary files /dev/null and b/RFDLoader_linux differ diff --git a/RFDLoader_osx b/RFDLoader_osx new file mode 100755 index 0000000..8cb0c26 Binary files /dev/null and b/RFDLoader_osx differ diff --git a/RFDLoader_pi b/RFDLoader_pi new file mode 100755 index 0000000..f656b43 Binary files /dev/null and b/RFDLoader_pi differ diff --git a/boards.txt b/boards.txt index c75a1fe..55c95ac 100644 --- a/boards.txt +++ b/boards.txt @@ -1,5 +1,6 @@ RFduino.name=RFduino +RFduino.build.board=RFduino RFduino.build.mcu=cortex-m0 RFduino.build.f_cpu=16000000 RFduino.build.core=arduino diff --git a/cores/arduino/HardwareSerial.h b/cores/arduino/HardwareSerial.h old mode 100755 new mode 100644 index 83fcffe..906d7eb --- a/cores/arduino/HardwareSerial.h +++ b/cores/arduino/HardwareSerial.h @@ -52,9 +52,9 @@ class HardwareSerial : public Stream { public: - void begin( const uint32_t dwBaudRate ) ; - void begin( const uint32_t dwBaudRate, uint8_t rx_pin, uint8_t tx_pin ) ; - void end(); + virtual void begin( const uint32_t dwBaudRate ) = 0; + virtual void begin( const uint32_t dwBaudRate, uint8_t rx_pin, uint8_t tx_pin ) = 0; + virtual void end() = 0; virtual int available(void) = 0; virtual int peek(void) = 0; virtual int read(void) = 0; diff --git a/cores/arduino/Memory.c b/cores/arduino/Memory.c old mode 100755 new mode 100644 index 3325acc..462f2a5 --- a/cores/arduino/Memory.c +++ b/cores/arduino/Memory.c @@ -48,6 +48,10 @@ int flashPageErase( uint8_t page ) if (page <= PAGE_FROM_ADDRESS(&_etextrelocate)) return 2; + // do not erase flash if the BLE radio is active + while (RFduinoBLE_radioActive) + ; + // enable flash page erase NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Een << NVMC_CONFIG_WEN_Pos); while (NRF_NVMC->READY == NVMC_READY_READY_Busy) @@ -79,7 +83,7 @@ int flashWrite( uint32_t *address, uint32_t value ) if (page <= PAGE_FROM_ADDRESS(&_etextrelocate)) return 2; - // do not write to flash in the BLE radio is active + // do not write to flash if the BLE radio is active while (RFduinoBLE_radioActive) ; diff --git a/cores/arduino/Memory.h b/cores/arduino/Memory.h old mode 100755 new mode 100644 diff --git a/cores/arduino/Print.cpp b/cores/arduino/Print.cpp index f3749fe..eb65413 100644 --- a/cores/arduino/Print.cpp +++ b/cores/arduino/Print.cpp @@ -346,6 +346,9 @@ size_t Print::printf(const char *format, ...) if (l < 1) l = -l; l %= 100; + if(l < 10){ + n += print(0); + } n += print(l); } } diff --git a/cores/arduino/Printable.h b/cores/arduino/Printable.h old mode 100755 new mode 100644 diff --git a/cores/arduino/RingBuffer.cpp b/cores/arduino/RingBuffer.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/Stream.cpp b/cores/arduino/Stream.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h old mode 100755 new mode 100644 diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/Tone.h b/cores/arduino/Tone.h old mode 100755 new mode 100644 diff --git a/cores/arduino/USARTClass.h b/cores/arduino/USARTClass.h old mode 100755 new mode 100644 diff --git a/cores/arduino/WCharacter.h b/cores/arduino/WCharacter.h old mode 100755 new mode 100644 diff --git a/cores/arduino/WMath.cpp b/cores/arduino/WMath.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/WMath.h b/cores/arduino/WMath.h old mode 100755 new mode 100644 diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/binary.h b/cores/arduino/binary.h old mode 100755 new mode 100644 diff --git a/cores/arduino/hooks.c b/cores/arduino/hooks.c old mode 100755 new mode 100644 diff --git a/cores/arduino/itoa.c b/cores/arduino/itoa.c old mode 100755 new mode 100644 diff --git a/cores/arduino/itoa.h b/cores/arduino/itoa.h old mode 100755 new mode 100644 diff --git a/cores/arduino/main.cpp b/cores/arduino/main.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/syscalls.h b/cores/arduino/syscalls.h old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring.c b/cores/arduino/wiring.c old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring.h b/cores/arduino/wiring.h old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c index a0843c2..0f58d53 100644 --- a/cores/arduino/wiring_analog.c +++ b/cores/arduino/wiring_analog.c @@ -109,10 +109,10 @@ uint32_t analogRead(uint32_t ulPin) (analog_reference << ADC_CONFIG_REFSEL_Pos)| // DEFAULT: Use supply voltage with 1/3 prescaling as reference for conversion. Only usable when supply voltage is between 2.5V and 3.6V (pselValue << ADC_CONFIG_PSEL_Pos)| // Select ADC input (ADC_CONFIG_EXTREFSEL_None << ADC_CONFIG_EXTREFSEL_Pos); - NRF_ADC->INTENCLR = 0xFFFFFFFF; - NRF_ADC->ENABLE = (ADC_ENABLE_ENABLE_Enabled << ADC_ENABLE_ENABLE_Pos); // Enable ADC - NRF_ADC->TASKS_START = 1; // Start A-D conversion - NRF_ADC->EVENTS_END = 0; + NRF_ADC->INTENCLR = 0xFFFFFFFF; + NRF_ADC->ENABLE = (ADC_ENABLE_ENABLE_Enabled << ADC_ENABLE_ENABLE_Pos); // Enable ADC + NRF_ADC->EVENTS_END = 0; // Reset end flag + NRF_ADC->TASKS_START = 1; // Start A-D conversion while (! NRF_ADC->EVENTS_END) // Wait for end of conversion ; ulValue = NRF_ADC->RESULT; // Read the value diff --git a/cores/arduino/wiring_constants.h b/cores/arduino/wiring_constants.h old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_digital.c b/cores/arduino/wiring_digital.c old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_digital.h b/cores/arduino/wiring_digital.h old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_pulse.cpp b/cores/arduino/wiring_pulse.cpp old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_pulse.h b/cores/arduino/wiring_pulse.h old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_shift.c b/cores/arduino/wiring_shift.c old mode 100755 new mode 100644 diff --git a/cores/arduino/wiring_shift.h b/cores/arduino/wiring_shift.h old mode 100755 new mode 100644 diff --git a/docs.png b/docs.png deleted file mode 100644 index f0d557e..0000000 Binary files a/docs.png and /dev/null differ diff --git a/iPhone Apps/rfduino/AppDelegate.h b/iPhone Apps/rfduino/AppDelegate.h deleted file mode 100755 index 42bfb28..0000000 --- a/iPhone Apps/rfduino/AppDelegate.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end diff --git a/iPhone Apps/rfduino/AppDelegate.m b/iPhone Apps/rfduino/AppDelegate.m deleted file mode 100755 index 5f68204..0000000 --- a/iPhone Apps/rfduino/AppDelegate.m +++ /dev/null @@ -1,102 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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" - -#import "ScanViewController.h" -#import "RFduinoManager.h" - -@interface AppDelegate() -{ - RFduinoManager *rfduinoManager; - bool wasScanning; -} -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions -{ - self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; - - rfduinoManager = RFduinoManager.sharedRFduinoManager; - - ScanViewController *viewController = [[ScanViewController alloc] init]; - - UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController]; - [self.window setRootViewController:navController]; - - navController.navigationBar.tintColor = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0]; - - self.window.backgroundColor = [UIColor whiteColor]; - [self.window makeKeyAndVisible]; - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application -{ - NSLog(@"applicationWillResignActive"); - - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. - - wasScanning = false; - - if (rfduinoManager.isScanning) { - wasScanning = true; - [rfduinoManager stopScan]; - } -} - -- (void)applicationDidEnterBackground:(UIApplication *)application -{ - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application -{ - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application -{ - NSLog(@"applicationDidBecomeActive"); - - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. - - if (wasScanning) { - [rfduinoManager startScan]; - wasScanning = false; - } -} - -- (void)applicationWillTerminate:(UIApplication *)application -{ - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/iPhone Apps/rfduino/CustomCellBackground.h b/iPhone Apps/rfduino/CustomCellBackground.h deleted file mode 100755 index a3e14fa..0000000 --- a/iPhone Apps/rfduino/CustomCellBackground.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -@interface CustomCellBackground : UIView -{ -} - -@property (nonatomic, strong) UIColor *startColor; -@property (nonatomic, strong) UIColor *stopColor; - -@end diff --git a/iPhone Apps/rfduino/CustomCellBackground.m b/iPhone Apps/rfduino/CustomCellBackground.m deleted file mode 100755 index 4f92e3b..0000000 --- a/iPhone Apps/rfduino/CustomCellBackground.m +++ /dev/null @@ -1,81 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 "CustomCellBackground.h" - -@implementation CustomCellBackground - -@synthesize startColor; -@synthesize stopColor; - -// http://www.raywenderlich.com/32283/core-graphics-tutorial-lines-rectangles-and-gradients - -void drawLinearGradient(CGContextRef context, CGRect rect, CGColorRef startColor, CGColorRef endColor) -{ - CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB(); - CGFloat locations[] = { 0.0, 1.0 }; - - NSArray *colors = @[(__bridge id) startColor, (__bridge id) endColor]; - - CGGradientRef gradient = CGGradientCreateWithColors(colorSpace, (__bridge CFArrayRef) colors, locations); - - CGPoint startPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect)); - CGPoint endPoint = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect)); - - CGContextSaveGState(context); - CGContextAddRect(context, rect); - CGContextClip(context); - CGContextDrawLinearGradient(context, gradient, startPoint, endPoint, 0); - CGContextRestoreGState(context); - - CGGradientRelease(gradient); - CGColorSpaceRelease(colorSpace); -} - -- (id)initWithFrame:(CGRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code - } - return self; -} - -// Only override drawRect: if you perform custom drawing. -// An empty implementation adversely affects performance during animation. -- (void)drawRect:(CGRect)rect -{ - CGContextRef context = UIGraphicsGetCurrentContext(); - - CGRect frameRect = self.bounds; - - // CGContextSetFillColorWithColor(context, redColor.CGColor); - // CGContextFillRect(context, self.bounds); - - drawLinearGradient(context, frameRect, startColor.CGColor, stopColor.CGColor); -} - -@end diff --git a/iPhone Apps/rfduino/RFduino.h b/iPhone Apps/rfduino/RFduino.h deleted file mode 100644 index 4d102c6..0000000 --- a/iPhone Apps/rfduino/RFduino.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR -#import -#elif TARGET_OS_MAC -#import -#endif - -#import "RFduinoDelegate.h" - -@class RFduinoManager; - -char data(NSData *data); -uint8_t dataByte(NSData *data); -int dataInt(NSData *data); -float dataFloat(NSData *data); - -// default NULL (NULL = previous fixed RFduino uuid) -extern NSString *customUUID; - -@interface RFduino : NSObject -{ -} - -@property(assign, nonatomic) id delegate; - -@property(strong, nonatomic) CBPeripheral *peripheral; - -@property(strong, nonatomic) RFduinoManager *rfduinoManager; - -@property(strong, nonatomic) NSString *name; -@property(strong, nonatomic) NSString *UUID; -@property(strong, nonatomic) NSData *advertisementData; -@property(strong, nonatomic) NSNumber *advertisementRSSI; -@property(assign, nonatomic) NSInteger advertisementPackets; -@property(strong, nonatomic) NSDate *lastAdvertisement; -@property(assign, nonatomic) NSInteger outOfRange; -- (void)connected; -- (void)disconnect; - -- (void)send:(NSData *)data; - -@end diff --git a/iPhone Apps/rfduino/RFduino.m b/iPhone Apps/rfduino/RFduino.m deleted file mode 100644 index 789db01..0000000 --- a/iPhone Apps/rfduino/RFduino.m +++ /dev/null @@ -1,206 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 "RFduino.h" - -#import "RFduinoManager.h" - -static const int max_data = 12; - -// default NULL (NULL = previous fixed RFduino uuid) -NSString *customUUID = NULL; - -static CBUUID *service_uuid; -static CBUUID *send_uuid; -static CBUUID *receive_uuid; -static CBUUID *disconnect_uuid; - -char data(NSData *data) -{ - return (char)dataByte(data); -} - -uint8_t dataByte(NSData *data) -{ - uint8_t *p = (uint8_t*)[data bytes]; - NSUInteger len = [data length]; - return (len ? *p : 0); -} - -int dataInt(NSData *data) -{ - uint8_t *p = (uint8_t*)[data bytes]; - NSUInteger len = [data length]; - return (sizeof(int) <= len ? *(int*)p : 0); -} - -float dataFloat(NSData *data) -{ - uint8_t *p = (uint8_t*)[data bytes]; - NSUInteger len = [data length]; - return (sizeof(float) <= len ? *(float*)p : 0); -} - -// increment the 16-bit uuid inside a 128-bit uuid -static void incrementUuid16(CBUUID *uuid, unsigned char amount) -{ - NSData *data = uuid.data; - unsigned char *bytes = (unsigned char *)[data bytes]; - unsigned char result = bytes[3] + amount; - if (result < bytes[3]) - bytes[2]++; - bytes[3] += amount; -} - -@interface RFduino() -{ - CBCharacteristic *send_characteristic; - CBCharacteristic *disconnect_characteristic; - bool loadedService; -} -@end - -@implementation RFduino - -@synthesize delegate; -@synthesize rfduinoManager; -@synthesize peripheral; - -@synthesize name; -@synthesize UUID; -@synthesize advertisementData; -@synthesize advertisementRSSI; -@synthesize advertisementPackets; -@synthesize outOfRange; - -- (id)init -{ - NSLog(@"rfduino init"); - - self = [super init]; - if (self) { - } - - return self; -} - -- (void)connected -{ - NSLog(@"rfduino connected"); - - service_uuid = [CBUUID UUIDWithString:(customUUID ? customUUID : @"2220")]; - receive_uuid = [CBUUID UUIDWithString:(customUUID ? customUUID : @"2221")]; - if (customUUID) - incrementUuid16(receive_uuid, 1); - send_uuid = [CBUUID UUIDWithString:(customUUID ? customUUID : @"2222")]; - if (customUUID) - incrementUuid16(send_uuid, 2); - disconnect_uuid = [CBUUID UUIDWithString:(customUUID ? customUUID : @"2223")]; - if (customUUID) - incrementUuid16(disconnect_uuid, 3); - peripheral.delegate = self; - - [peripheral discoverServices:[NSArray arrayWithObject:service_uuid]]; -} - -#pragma mark - CBPeripheralDelegate methods - -- (void)peripheral:(CBPeripheral *)_peripheral didDiscoverServices:(NSError *)error -{ - NSLog(@"didDiscoverServices"); - - for (CBService *service in peripheral.services) { - if ([service.UUID isEqual:service_uuid]) - { - NSArray *characteristics = [NSArray arrayWithObjects:receive_uuid, send_uuid, disconnect_uuid, nil]; - [peripheral discoverCharacteristics:characteristics forService:service]; - } - } -} - -- (void)peripheral:(CBPeripheral *)_peripheral didDiscoverCharacteristicsForService:(CBService *)service error:(NSError *)error -{ - NSLog(@"didDiscoverCharacteristicsForService"); - for (CBService *service in peripheral.services) { - if ([service.UUID isEqual:service_uuid]) { - for (CBCharacteristic *characteristic in service.characteristics) { - if ([characteristic.UUID isEqual:receive_uuid]) { - [peripheral setNotifyValue:YES forCharacteristic:characteristic]; - } else if ([characteristic.UUID isEqual:send_uuid]) { - send_characteristic = characteristic; - } else if ([characteristic.UUID isEqual:disconnect_uuid]) { - disconnect_characteristic = characteristic; - } - } - - loadedService = true; - [rfduinoManager loadedServiceRFduino:self]; - } - } -} - -- (void)peripheral:(CBPeripheral *)aPeripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error -{ - NSLog(@"didUpdateValueForCharacteristic"); - if ([characteristic.UUID isEqual:receive_uuid]) { - SEL didReceive = @selector(didReceive:); - if ([delegate respondsToSelector:didReceive]) { - [delegate didReceive:characteristic.value]; - } - } -} - -#pragma mark - RFduino methods - -- (void)send:(NSData *)data -{ - if (! loadedService) { - @throw [NSException exceptionWithName:@"sendData" reason:@"please wait for ready callback" userInfo:nil]; - } - - if ([data length] > max_data) { - @throw [NSException exceptionWithName:@"sendData" reason:@"max data size exceeded" userInfo:nil]; - } - - [peripheral writeValue:data forCharacteristic:send_characteristic type:CBCharacteristicWriteWithoutResponse]; -} - -- (void)disconnect -{ - NSLog(@"rfduino disconnect"); - - if (loadedService) { - NSLog(@"writing to disconnect characteristic"); - // fix for iOS SDK 7.0 - at least one byte must now be transferred - uint8_t flag = 1; - NSData *data = [NSData dataWithBytes:(void*)&flag length:1]; - [peripheral writeValue:data forCharacteristic:disconnect_characteristic type:CBCharacteristicWriteWithoutResponse]; - } - - [rfduinoManager disconnectRFduino:self]; -} - -@end diff --git a/iPhone Apps/rfduino/RFduinoDelegate.h b/iPhone Apps/rfduino/RFduinoDelegate.h deleted file mode 100755 index b91b720..0000000 --- a/iPhone Apps/rfduino/RFduinoDelegate.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -@protocol RFduinoDelegate - -@optional - -- (void)didReceive:(NSData *)data; - -@end diff --git a/iPhone Apps/rfduino/RFduinoManagerDelegate.h b/iPhone Apps/rfduino/RFduinoManagerDelegate.h deleted file mode 100755 index 50f750c..0000000 --- a/iPhone Apps/rfduino/RFduinoManagerDelegate.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -@class RFduino; - -@protocol RFduinoManagerDelegate - -- (void)didDiscoverRFduino:(RFduino *)rfduino; - -@optional - -- (void)didUpdateDiscoveredRFduino:(RFduino *)rfduino; - -- (void)didConnectRFduino:(RFduino *)rfduino; -- (void)didLoadServiceRFduino:(RFduino *)rfduino; -- (void)didDisconnectRFduino:(RFduino *)rfduino; - -@end diff --git a/iPhone Apps/rfduino/RfduinoManager.h b/iPhone Apps/rfduino/RfduinoManager.h deleted file mode 100755 index e2c1c28..0000000 --- a/iPhone Apps/rfduino/RfduinoManager.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR -#import -#elif TARGET_OS_MAC -#import -#endif - -#import "RFduinoManagerDelegate.h" - -@interface RFduinoManager : NSObject -{ - CBCentralManager *central; -} - -+ (RFduinoManager *)sharedRFduinoManager; - -@property (nonatomic, assign) id delegate; -@property (nonatomic, strong) NSMutableArray *rfduinos; - -- (bool)isScanning; -- (void)startScan; -- (void)stopScan; - -- (void)connectRFduino:(RFduino *)rfduino; -- (void)disconnectRFduino:(RFduino *)rfduino; - -- (void)loadedServiceRFduino:(RFduino *)rfduino; - -@end diff --git a/iPhone Apps/rfduino/RfduinoManager.m b/iPhone Apps/rfduino/RfduinoManager.m deleted file mode 100644 index dec6846..0000000 --- a/iPhone Apps/rfduino/RfduinoManager.m +++ /dev/null @@ -1,391 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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. -*/ - -#include - -#import "RFduinoManager.h" - -#import "RFduino.h" - -static CBUUID *service_uuid; - -@interface RFduinoManager() -{ - NSTimer *rangeTimer; - int rangeTimerCount; - bool didUpdateDiscoveredRFduinoFlag; - void (^cancelBlock)(void); - bool isScanning; -} -@end - -@implementation RFduinoManager - -@synthesize delegate; -@synthesize rfduinos; - -+ (RFduinoManager *)sharedRFduinoManager -{ - static RFduinoManager *rfduinoManager; - if (! rfduinoManager) { - rfduinoManager = [[RFduinoManager alloc] init]; - } - return rfduinoManager; -} - -- (id)init -{ - NSLog(@"init"); - - self = [super init]; - - if (self) { - service_uuid = [CBUUID UUIDWithString:(customUUID ? customUUID : @"2220")]; - - rfduinos = [[NSMutableArray alloc] init]; - - central = [[CBCentralManager alloc] initWithDelegate:self queue:nil]; - } - - return self; -} - -- (bool)isBluetoothLESupported -{ - if ([central state] == CBCentralManagerStatePoweredOn) - return YES; - - NSString *message; - - switch ([central state]) - { - case CBCentralManagerStateUnsupported: - message = @"This hardware doesn't support Bluetooth Low Energy."; - break; - case CBCentralManagerStateUnauthorized: - message = @"This app is not authorized to use Bluetooth Low Energy."; - break; - case CBCentralManagerStatePoweredOff: - message = @"Bluetooth is currently powered off."; - break; - case CBCentralManagerStateUnknown: - // fall through - default: - message = @"Bluetooth state is unknown."; - - } - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Bluetooth LE Support" - message:message - delegate:nil - cancelButtonTitle:@"OK" - otherButtonTitles:nil]; - [alert show]; - -#endif - - return NO; -} - -- (void)startRangeTimer -{ - rangeTimerCount = 0; - - rangeTimer = [NSTimer scheduledTimerWithTimeInterval:1.0 - target:self - selector:@selector(rangeTick:) - userInfo:nil - repeats:YES]; - -} - -- (void)stopRangeTimer -{ - [rangeTimer invalidate]; -} - -- (void) rangeTick:(NSTimer*)timer -{ - bool update = false; - - rangeTimerCount++; - if ((rangeTimerCount % 60) == 0) { - // NSLog(@"restarting scanning"); - - [central stopScan]; - - NSDictionary *options = nil; - options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] - forKey:CBCentralManagerScanOptionAllowDuplicatesKey]; - [central scanForPeripheralsWithServices:[NSArray arrayWithObject:service_uuid] options:options]; - } - - - NSDate *date = [NSDate date]; - for (RFduino *rfduino in rfduinos) { - if (!rfduino.outOfRange - && rfduino.lastAdvertisement != NULL - && [date timeIntervalSinceDate:rfduino.lastAdvertisement] > 2) - { - rfduino.outOfRange = true; - update = true; - } - } - - if (update) { - if (didUpdateDiscoveredRFduinoFlag) { - [delegate didUpdateDiscoveredRFduino:nil]; - } - } -} - -#pragma mark - CentralManagerDelegate methods - -- (void)centralManager:(CBCentralManager *)central didConnectPeripheral:(CBPeripheral *)peripheral -{ - NSLog(@"didConnectPeripheral"); - - RFduino *rfduino = [self rfduinoForPeripheral:peripheral]; - if (rfduino) { - [rfduino connected]; - [delegate didConnectRFduino:rfduino]; - } -} - -- (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error -{ - NSLog(@"didDisconnectPeripheral"); - - void (^block)(void) = ^{ - if ([delegate respondsToSelector:@selector(didDisconnectRFduino:)]) { - RFduino *rfduino = [self rfduinoForPeripheral:peripheral]; - if (rfduino) { - [delegate didDisconnectRFduino:rfduino]; - } - } - }; - - if (error.code) { - cancelBlock = block; - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Peripheral Disconnected with Error" - message:error.description - delegate:self - cancelButtonTitle:@"OK" - otherButtonTitles:nil]; - [alert show]; - -#endif - - } - else - block(); - - if (peripheral) { - [peripheral setDelegate:nil]; - peripheral = nil; - } -} - -- (RFduino *)rfduinoForPeripheral:(CBPeripheral *)peripheral -{ - for (RFduino *rfduino in rfduinos) { - if ([peripheral isEqual:rfduino.peripheral]) { - return rfduino; - } - } - return nil; -} - -- (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeripheral *)peripheral advertisementData:(NSDictionary *)advertisementData RSSI:(NSNumber *)RSSI -{ - // NSLog(@"didDiscoverPeripheral"); - - NSString *uuid = NULL; - if (peripheral.UUID) { - // only returned if you have connected to the device before - uuid = (__bridge_transfer NSString *)CFUUIDCreateString(NULL, peripheral.UUID); - } else { - uuid = @""; - } - - bool added = false; - - RFduino *rfduino = [self rfduinoForPeripheral:peripheral]; - if (! rfduino) { - rfduino = [[RFduino alloc] init]; - - rfduino.rfduinoManager = self; - - rfduino.name = peripheral.name; - rfduino.UUID = uuid; - - rfduino.peripheral = peripheral; - - added = true; - - [rfduinos addObject:rfduino]; - } - - rfduino.advertisementData = nil; - - id manufacturerData = [advertisementData objectForKey:CBAdvertisementDataManufacturerDataKey]; - if (manufacturerData) { - const uint8_t *bytes = [manufacturerData bytes]; - int len = [manufacturerData length]; - // skip manufacturer uuid - NSData *data = [NSData dataWithBytes:bytes+2 length:len-2]; - rfduino.advertisementData = data; - } - - rfduino.advertisementRSSI = RSSI; - rfduino.advertisementPackets++; - rfduino.lastAdvertisement = [NSDate date]; - rfduino.outOfRange = false; - - if (added) { - [delegate didDiscoverRFduino:rfduino]; - } else { - if (didUpdateDiscoveredRFduinoFlag) { - [delegate didUpdateDiscoveredRFduino:rfduino]; - } - } -} - -- (void)centralManager:(CBCentralManager *)central didFailToConnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error -{ - NSLog(@"didFailToConnectPeripheral"); - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - - UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Connect Failed" - message:error.description - delegate:nil - cancelButtonTitle:@"OK" - otherButtonTitles:nil]; - [alert show]; - -#endif - -} - -- (void)centralManager:(CBCentralManager *)central didRetrieveConnectedPeripherals:(NSArray *)peripherals -{ -} - -- (void)centralManagerDidUpdateState:(CBCentralManager *)aCentral -{ - NSLog(@"central manager state = %d", [central state]); - - bool success = [self isBluetoothLESupported]; - if (success) { - [self startScan]; - } -} - -#pragma mark - UIAlertViewDelegate methods - -#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR - -- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger) buttonIndex -{ - if (buttonIndex == 0) { - cancelBlock(); - } -} - -#endif - -#pragma mark - Rfduino methods - -- (bool)isScanning -{ - return isScanning; -} - -- (void)startScan -{ - NSLog(@"startScan"); - - isScanning = true; - - NSDictionary *options = nil; - - didUpdateDiscoveredRFduinoFlag = [delegate respondsToSelector:@selector(didUpdateDiscoveredRFduino:)]; - - if (didUpdateDiscoveredRFduinoFlag) { - options = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:YES] - forKey:CBCentralManagerScanOptionAllowDuplicatesKey]; - } - - [rfduinos removeAllObjects]; - - [central scanForPeripheralsWithServices:[NSArray arrayWithObject:service_uuid] options:options]; - - if (didUpdateDiscoveredRFduinoFlag) { - [self startRangeTimer]; - } -} - -- (void)stopScan -{ - NSLog(@"stopScan"); - - if (didUpdateDiscoveredRFduinoFlag) { - [self stopRangeTimer]; - } - - [central stopScan]; - - isScanning = false; -} - -- (void)connectRFduino:(RFduino *)rfduino -{ - NSLog(@"connectRFduino"); - - [central connectPeripheral:[rfduino peripheral] options:nil]; -} - -- (void)disconnectRFduino:(RFduino *)rfduino -{ - NSLog(@"rfduinoManager disconnectPeripheral"); - - [central cancelPeripheralConnection:rfduino.peripheral]; -} - -- (void)loadedServiceRFduino:(id)rfduino -{ - if ([delegate respondsToSelector:@selector(didLoadServiceRFduino:)]) { - [delegate didLoadServiceRFduino:rfduino]; - } -} - -@end diff --git a/iPhone Apps/rfduino/ScanViewController.h b/iPhone Apps/rfduino/ScanViewController.h deleted file mode 100755 index 2da947f..0000000 --- a/iPhone Apps/rfduino/ScanViewController.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#import "RFduinoManagerDelegate.h" - -@class RFduinoManager; -@class RFduino; - -@interface ScanViewController : UITableViewController -{ - RFduinoManager *rfduinoManager; -} - -@end diff --git a/iPhone Apps/rfduino/ScanViewController.m b/iPhone Apps/rfduino/ScanViewController.m deleted file mode 100755 index 44d9846..0000000 --- a/iPhone Apps/rfduino/ScanViewController.m +++ /dev/null @@ -1,320 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#import "ScanViewController.h" - -#import "RFduinoManager.h" -#import "RFduino.h" - -#import "AppViewController.h" - -#import "CustomCellBackground.h" - -@interface ScanViewController() -{ - bool editingRow; - bool loadService; -} -@end - -@implementation ScanViewController - -- (id)initWithStyle:(UITableViewStyle)style -{ - self = [super initWithStyle:style]; - if (self) { - UINavigationItem *navItem = [self navigationItem]; - [navItem setTitle:@"Found RFduinos"]; - - rfduinoManager = [RFduinoManager sharedRFduinoManager]; - } - return self; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - // Uncomment the following line to preserve selection between presentations. - // self.clearsSelectionOnViewWillAppear = NO; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; - - rfduinoManager.delegate = self; - - int numberOfLines = 3; - self.tableView.rowHeight = (44.0 + (numberOfLines - 1) * 19.0); - - UIColor *start = [UIColor colorWithRed:58/255.0 green:108/255.0 blue:183/255.0 alpha:0.15]; - UIColor *stop = [UIColor colorWithRed:58/255.0 green:108/255.0 blue:183/255.0 alpha:0.45]; - - CAGradientLayer *gradient = [CAGradientLayer layer]; - // gradient.frame = [self.view bounds]; - gradient.frame = CGRectMake(0.0, 0.0, 1024.0, 1024.0); - gradient.colors = [NSArray arrayWithObjects:(id)start.CGColor, (id)stop.CGColor, nil]; - [self.tableView.layer insertSublayer:gradient atIndex:0]; -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -#pragma mark - Table view data source - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView -{ - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section -{ - return [[rfduinoManager rfduinos] count]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath -{ - static NSMutableArray *signalStrength = nil; - if (! signalStrength) { - signalStrength = [[NSMutableArray alloc] init]; - } - - static NSString *cellIdentifier = @"Cell"; - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; - if (! cell) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:cellIdentifier]; - - cell.textLabel.backgroundColor = [UIColor clearColor]; - cell.detailTextLabel.backgroundColor = [UIColor clearColor]; - - UIProgressView *view = [[UIProgressView alloc]initWithProgressViewStyle:UIProgressViewStyleBar]; - view.frame = CGRectMake(0.0, 0.0, 150.0, 0.0); - view.center = CGPointMake(225,14); - view.progressViewStyle = UIProgressViewStyleDefault; - view.progressTintColor = [UIColor colorWithRed:0.0 green:0.5 blue:0.0 alpha:1.0]; - - [cell addSubview:view]; - - [signalStrength setObject:view atIndexedSubscript:indexPath.row]; - } - - RFduino *rfduino = [rfduinoManager.rfduinos objectAtIndex:[indexPath row]]; - - UIColor *start; - UIColor *stop; - if (rfduino.outOfRange) { - start = [UIColor colorWithRed:160/255.0 green:160/255.0 blue:160/255.0 alpha:0.8]; - stop = [UIColor colorWithRed:160/255.0 green:160/255.0 blue:160/255.0 alpha:0.2]; - } else if (! rfduino.UUID.length) { - start = [UIColor colorWithRed:224/255.0 green:242/255.0 blue:224/255.0 alpha: 1.0]; - stop = [UIColor colorWithRed:224/255.0 green:242/255.0 blue:224/255.0 alpha: 0.7]; - } else { - start = [UIColor colorWithRed:253/255.0 green:255/255.0 blue:255/255.0 alpha: 1.0]; - stop = [UIColor colorWithRed:253/255.0 green:255/255.0 blue:255/255.0 alpha: 0.7]; - } - - CustomCellBackground *ccb = [[CustomCellBackground alloc] init]; - ccb.startColor = start; - ccb.stopColor = stop; - cell.backgroundView = ccb; - - NSString *text = [[NSString alloc] initWithFormat:@"%@", rfduino.name]; - - NSString *uuid = rfduino.UUID; - - int rssi = rfduino.advertisementRSSI.intValue; - - NSString *advertising = @""; - if (rfduino.advertisementData) { - advertising = [[NSString alloc] initWithData:rfduino.advertisementData encoding:NSUTF8StringEncoding]; - } - - NSMutableString *detail = [NSMutableString stringWithCapacity:100]; - [detail appendFormat:@"RSSI: %d dBm", rssi]; - while ([detail length] < 25) - [detail appendString:@" "]; - [detail appendFormat:@"Packets: %d\n", rfduino.advertisementPackets]; - [detail appendFormat:@"Advertising: %@\n", advertising]; - [detail appendFormat:@"%@", uuid]; - - cell.textLabel.text = text; - cell.detailTextLabel.text = detail; - cell.detailTextLabel.numberOfLines = 3; - - if (indexPath.row < signalStrength.count) { - UIProgressView *view = [signalStrength objectAtIndex:indexPath.row]; - if (view) { - int value = rssi; - - // only interested in graphing the rssi range between -75 and -103 - if (value > -75) { - value = -75; - } - if (value < -103) { - value = -103; - } - - // translate rssi to signal strength between 0 and 28 - value += 103; - - // calculate ratio - float ratio = (float)value / (-75 - -103); - - // moving average over 20 samples - int samples = 20; - if ([advertising hasPrefix:@"-"]) { - // device using non-default avertising (switch the instaneous sampling) - samples = 1; - } - - if (view.progress == 0.0) { - // use the instantaneous value for the first sample - view.progress = ratio; - } else { - view.progress = (ratio * 1.0/samples) + (view.progress * (samples - 1.0)/samples); - } - } - } - - return cell; -} - -// Override to support conditional editing of the table view. -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath -{ - RFduino *rfduino = [rfduinoManager.rfduinos objectAtIndex:[indexPath row]]; - // Return NO if you do not want the specified item to be editable. - return (rfduino.outOfRange ? YES : NO); -} - -- (void)tableView:(UITableView *)tableView willBeginEditingRowAtIndexPath:(NSIndexPath *)indexPath -{ - editingRow = true; -} - -- (void)tableView:(UITableView *)tableView didEndEditingRowAtIndexPath:(NSIndexPath *)indexPath -{ - editingRow = false; -} - -// Override to support editing the table view. -- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath -{ - if (editingStyle == UITableViewCellEditingStyleDelete) { - // Delete the row from the data source - [rfduinoManager.rfduinos removeObjectAtIndex:[indexPath row]]; - [tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } - /* - else if (editingStyle == UITableViewCellEditingStyleInsert) { - // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view - } - */ -} - -/* -// Override to support rearranging the table view. -- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath -{ -} -*/ - -/* -// Override to support conditional rearranging of the table view. -- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath -{ - // Return NO if you do not want the item to be re-orderable. - return YES; -} -*/ - -#pragma mark - Table view delegate - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath -{ - RFduino *rfduino = [[rfduinoManager rfduinos] objectAtIndex:[indexPath row]]; - - if (! rfduino.outOfRange) { - [rfduinoManager connectRFduino:rfduino]; - } else { - [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; - } -} - -#pragma mark - RfduinoDiscoveryDelegate methods - -- (void)didDiscoverRFduino:(RFduino *)rfduino -{ - NSLog(@"didDiscoverRFduino"); - if (! editingRow) { - NSLog(@"reloadData"); - [self.tableView reloadData]; - } -} - -- (void)didUpdateDiscoveredRFduino:(RFduino *)rfduino -{ - // NSLog(@"didUpdateRFduino"); - if (! editingRow) { - [self.tableView reloadData]; - } -} - -- (void)didConnectRFduino:(RFduino *)rfduino -{ - NSLog(@"didConnectRFduino"); - - [rfduinoManager stopScan]; - - loadService = false; -} - -- (void)didLoadServiceRFduino:(RFduino *)rfduino -{ - AppViewController *viewController = [[AppViewController alloc] init]; - viewController.rfduino = rfduino; - - loadService = true; - [[self navigationController] pushViewController:viewController animated:YES]; -} - -- (void)didDisconnectRFduino:(RFduino *)rfduino -{ - NSLog(@"didDisconnectRFduino"); - - if (loadService) { - [[self navigationController] popViewControllerAnimated:YES]; - } - - [rfduinoManager startScan]; - [self.tableView reloadData]; -} - -@end diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.pbxproj b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.pbxproj deleted file mode 100755 index 976758a..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.pbxproj +++ /dev/null @@ -1,469 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - AABEB8C6185167E000833990 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8C5185167E000833990 /* Foundation.framework */; }; - AABEB8C8185167E000833990 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8C7185167E000833990 /* CoreGraphics.framework */; }; - AABEB8CA185167E000833990 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8C9185167E000833990 /* UIKit.framework */; }; - AABEB8D0185167E000833990 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AABEB8CE185167E000833990 /* InfoPlist.strings */; }; - AABEB8D2185167E000833990 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB8D1185167E000833990 /* main.m */; }; - AABEB8D8185167E000833990 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AABEB8D7185167E000833990 /* Images.xcassets */; }; - AABEB8DF185167E000833990 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8DE185167E000833990 /* XCTest.framework */; }; - AABEB8E0185167E000833990 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8C5185167E000833990 /* Foundation.framework */; }; - AABEB8E1185167E000833990 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AABEB8C9185167E000833990 /* UIKit.framework */; }; - AABEB901185167EC00833990 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB8F6185167EC00833990 /* AppDelegate.m */; }; - AABEB902185167EC00833990 /* CustomCellBackground.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB8F8185167EC00833990 /* CustomCellBackground.m */; }; - AABEB903185167EC00833990 /* RFduino.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB8FA185167EC00833990 /* RFduino.m */; }; - AABEB904185167EC00833990 /* RfduinoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB8FD185167EC00833990 /* RfduinoManager.m */; }; - AABEB905185167EC00833990 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB900185167EC00833990 /* ScanViewController.m */; }; - AABEB9081851682000833990 /* AppViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AABEB9071851682000833990 /* AppViewController.m */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - AABEB8E2185167E000833990 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = AABEB8BA185167E000833990 /* Project object */; - proxyType = 1; - remoteGlobalIDString = AABEB8C1185167E000833990; - remoteInfo = rfduinoBulkDataTransfer; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - AABEB8C2185167E000833990 /* rfduinoBulkDataTransfer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rfduinoBulkDataTransfer.app; sourceTree = BUILT_PRODUCTS_DIR; }; - AABEB8C5185167E000833990 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - AABEB8C7185167E000833990 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - AABEB8C9185167E000833990 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - AABEB8CD185167E000833990 /* rfduinoBulkDataTransfer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "rfduinoBulkDataTransfer-Info.plist"; sourceTree = ""; }; - AABEB8CF185167E000833990 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - AABEB8D1185167E000833990 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - AABEB8D3185167E000833990 /* rfduinoBulkDataTransfer-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rfduinoBulkDataTransfer-Prefix.pch"; sourceTree = ""; }; - AABEB8D7185167E000833990 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - AABEB8DD185167E000833990 /* rfduinoBulkDataTransferTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = rfduinoBulkDataTransferTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - AABEB8DE185167E000833990 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - AABEB8F5185167EC00833990 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - AABEB8F6185167EC00833990 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - AABEB8F7185167EC00833990 /* CustomCellBackground.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomCellBackground.h; sourceTree = ""; }; - AABEB8F8185167EC00833990 /* CustomCellBackground.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomCellBackground.m; sourceTree = ""; }; - AABEB8F9185167EC00833990 /* RFduino.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduino.h; sourceTree = ""; }; - AABEB8FA185167EC00833990 /* RFduino.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFduino.m; sourceTree = ""; }; - AABEB8FB185167EC00833990 /* RFduinoDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduinoDelegate.h; sourceTree = ""; }; - AABEB8FC185167EC00833990 /* RfduinoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RfduinoManager.h; sourceTree = ""; }; - AABEB8FD185167EC00833990 /* RfduinoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RfduinoManager.m; sourceTree = ""; }; - AABEB8FE185167EC00833990 /* RFduinoManagerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduinoManagerDelegate.h; sourceTree = ""; }; - AABEB8FF185167EC00833990 /* ScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanViewController.h; sourceTree = ""; }; - AABEB900185167EC00833990 /* ScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanViewController.m; sourceTree = ""; }; - AABEB9061851682000833990 /* AppViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppViewController.h; sourceTree = ""; }; - AABEB9071851682000833990 /* AppViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppViewController.m; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - AABEB8BF185167E000833990 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AABEB8C8185167E000833990 /* CoreGraphics.framework in Frameworks */, - AABEB8CA185167E000833990 /* UIKit.framework in Frameworks */, - AABEB8C6185167E000833990 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - AABEB8DA185167E000833990 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AABEB8DF185167E000833990 /* XCTest.framework in Frameworks */, - AABEB8E1185167E000833990 /* UIKit.framework in Frameworks */, - AABEB8E0185167E000833990 /* Foundation.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - AABEB8B9185167E000833990 = { - isa = PBXGroup; - children = ( - AABEB8F4185167EC00833990 /* rfduino */, - AABEB8CB185167E000833990 /* rfduinoBulkDataTransfer */, - AABEB8C4185167E000833990 /* Frameworks */, - AABEB8C3185167E000833990 /* Products */, - ); - sourceTree = ""; - }; - AABEB8C3185167E000833990 /* Products */ = { - isa = PBXGroup; - children = ( - AABEB8C2185167E000833990 /* rfduinoBulkDataTransfer.app */, - AABEB8DD185167E000833990 /* rfduinoBulkDataTransferTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; - AABEB8C4185167E000833990 /* Frameworks */ = { - isa = PBXGroup; - children = ( - AABEB8C5185167E000833990 /* Foundation.framework */, - AABEB8C7185167E000833990 /* CoreGraphics.framework */, - AABEB8C9185167E000833990 /* UIKit.framework */, - AABEB8DE185167E000833990 /* XCTest.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - AABEB8CB185167E000833990 /* rfduinoBulkDataTransfer */ = { - isa = PBXGroup; - children = ( - AABEB9061851682000833990 /* AppViewController.h */, - AABEB9071851682000833990 /* AppViewController.m */, - AABEB8D7185167E000833990 /* Images.xcassets */, - AABEB8CC185167E000833990 /* Supporting Files */, - ); - path = rfduinoBulkDataTransfer; - sourceTree = ""; - }; - AABEB8CC185167E000833990 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - AABEB8CD185167E000833990 /* rfduinoBulkDataTransfer-Info.plist */, - AABEB8CE185167E000833990 /* InfoPlist.strings */, - AABEB8D1185167E000833990 /* main.m */, - AABEB8D3185167E000833990 /* rfduinoBulkDataTransfer-Prefix.pch */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - AABEB8F4185167EC00833990 /* rfduino */ = { - isa = PBXGroup; - children = ( - AABEB8F5185167EC00833990 /* AppDelegate.h */, - AABEB8F6185167EC00833990 /* AppDelegate.m */, - AABEB8F7185167EC00833990 /* CustomCellBackground.h */, - AABEB8F8185167EC00833990 /* CustomCellBackground.m */, - AABEB8F9185167EC00833990 /* RFduino.h */, - AABEB8FA185167EC00833990 /* RFduino.m */, - AABEB8FB185167EC00833990 /* RFduinoDelegate.h */, - AABEB8FC185167EC00833990 /* RfduinoManager.h */, - AABEB8FD185167EC00833990 /* RfduinoManager.m */, - AABEB8FE185167EC00833990 /* RFduinoManagerDelegate.h */, - AABEB8FF185167EC00833990 /* ScanViewController.h */, - AABEB900185167EC00833990 /* ScanViewController.m */, - ); - name = rfduino; - path = ../rfduino; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - AABEB8C1185167E000833990 /* rfduinoBulkDataTransfer */ = { - isa = PBXNativeTarget; - buildConfigurationList = AABEB8EE185167E000833990 /* Build configuration list for PBXNativeTarget "rfduinoBulkDataTransfer" */; - buildPhases = ( - AABEB8BE185167E000833990 /* Sources */, - AABEB8BF185167E000833990 /* Frameworks */, - AABEB8C0185167E000833990 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = rfduinoBulkDataTransfer; - productName = rfduinoBulkDataTransfer; - productReference = AABEB8C2185167E000833990 /* rfduinoBulkDataTransfer.app */; - productType = "com.apple.product-type.application"; - }; - AABEB8DC185167E000833990 /* rfduinoBulkDataTransferTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = AABEB8F1185167E000833990 /* Build configuration list for PBXNativeTarget "rfduinoBulkDataTransferTests" */; - buildPhases = ( - AABEB8D9185167E000833990 /* Sources */, - AABEB8DA185167E000833990 /* Frameworks */, - AABEB8DB185167E000833990 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - AABEB8E3185167E000833990 /* PBXTargetDependency */, - ); - name = rfduinoBulkDataTransferTests; - productName = rfduinoBulkDataTransferTests; - productReference = AABEB8DD185167E000833990 /* rfduinoBulkDataTransferTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - AABEB8BA185167E000833990 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0500; - ORGANIZATIONNAME = RFduino; - TargetAttributes = { - AABEB8DC185167E000833990 = { - TestTargetID = AABEB8C1185167E000833990; - }; - }; - }; - buildConfigurationList = AABEB8BD185167E000833990 /* Build configuration list for PBXProject "rfduinoBulkDataTransfer" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = AABEB8B9185167E000833990; - productRefGroup = AABEB8C3185167E000833990 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - AABEB8C1185167E000833990 /* rfduinoBulkDataTransfer */, - AABEB8DC185167E000833990 /* rfduinoBulkDataTransferTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - AABEB8C0185167E000833990 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AABEB8D0185167E000833990 /* InfoPlist.strings in Resources */, - AABEB8D8185167E000833990 /* Images.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - AABEB8DB185167E000833990 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - AABEB8BE185167E000833990 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AABEB902185167EC00833990 /* CustomCellBackground.m in Sources */, - AABEB904185167EC00833990 /* RfduinoManager.m in Sources */, - AABEB8D2185167E000833990 /* main.m in Sources */, - AABEB905185167EC00833990 /* ScanViewController.m in Sources */, - AABEB901185167EC00833990 /* AppDelegate.m in Sources */, - AABEB9081851682000833990 /* AppViewController.m in Sources */, - AABEB903185167EC00833990 /* RFduino.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - AABEB8D9185167E000833990 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - AABEB8E3185167E000833990 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = AABEB8C1185167E000833990 /* rfduinoBulkDataTransfer */; - targetProxy = AABEB8E2185167E000833990 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - AABEB8CE185167E000833990 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - AABEB8CF185167E000833990 /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - AABEB8EC185167E000833990 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - AABEB8ED185167E000833990 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - AABEB8EF185167E000833990 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch"; - INFOPLIST_FILE = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - AABEB8F0185167E000833990 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch"; - INFOPLIST_FILE = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; - AABEB8F2185167E000833990 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/rfduinoBulkDataTransfer.app/rfduinoBulkDataTransfer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - INFOPLIST_FILE = "rfduinoBulkDataTransferTests/rfduinoBulkDataTransferTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Debug; - }; - AABEB8F3185167E000833990 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/rfduinoBulkDataTransfer.app/rfduinoBulkDataTransfer"; - FRAMEWORK_SEARCH_PATHS = ( - "$(SDKROOT)/Developer/Library/Frameworks", - "$(inherited)", - "$(DEVELOPER_FRAMEWORKS_DIR)", - ); - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch"; - INFOPLIST_FILE = "rfduinoBulkDataTransferTests/rfduinoBulkDataTransferTests-Info.plist"; - PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUNDLE_LOADER)"; - WRAPPER_EXTENSION = xctest; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - AABEB8BD185167E000833990 /* Build configuration list for PBXProject "rfduinoBulkDataTransfer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AABEB8EC185167E000833990 /* Debug */, - AABEB8ED185167E000833990 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - AABEB8EE185167E000833990 /* Build configuration list for PBXNativeTarget "rfduinoBulkDataTransfer" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AABEB8EF185167E000833990 /* Debug */, - AABEB8F0185167E000833990 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; - AABEB8F1185167E000833990 /* Build configuration list for PBXNativeTarget "rfduinoBulkDataTransferTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AABEB8F2185167E000833990 /* Debug */, - AABEB8F3185167E000833990 /* Release */, - ); - defaultConfigurationIsVisible = 0; - }; -/* End XCConfigurationList section */ - }; - rootObject = AABEB8BA185167E000833990 /* Project object */; -} diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100755 index 076b6fe..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100755 index 3c6d210..0000000 Binary files a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/project.xcworkspace/xcuserdata/steve.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/rfduinoBulkDataTransfer.xcscheme b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/rfduinoBulkDataTransfer.xcscheme deleted file mode 100755 index a7efb8a..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/rfduinoBulkDataTransfer.xcscheme +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/xcschememanagement.plist b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100755 index 3c1b9fa..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer.xcodeproj/xcuserdata/steve.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,27 +0,0 @@ - - - - - SchemeUserState - - rfduinoBulkDataTransfer.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - AABEB8C1185167E000833990 - - primary - - - AABEB8DC185167E000833990 - - primary - - - - - diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.h b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.h deleted file mode 100755 index 5730d4c..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#import "RFduino.h" - -@interface AppViewController : UIViewController -{ -} - -@property(strong, nonatomic) RFduino *rfduino; - -@end diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.m b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.m deleted file mode 100644 index e9e81be..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/AppViewController.m +++ /dev/null @@ -1,169 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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. -*/ - -/* -This is the matching iPhone for the bulk data transfer sketch. This -application has been included for completeness, and to demonstrate -how you could verify that no data was dropped. Its really for -educational use only - it's output is to the debug window, and it -doesn't have a UI. - -If you would like to test bulk data transfer with one of the existing -apps, you can use the ColorWheel application. Open the sketch in -Arduino, compile and open the Serial Monitor. Open the ColorWheel -application and connect to the sketch. Once connected, the sketch -will start transferring the data (The ColorWheel application receives -the data, but ignores it). After the transfer is complete, the -Serial Monitor will display the start time, end time, elapsed time, -and kbps. -*/ - -#import - -#import "AppViewController.h" - -@implementation AppViewController -{ - int packets; - char ch; - int packet; - double start; -} - -@synthesize rfduino; - -+ (void)load -{ - // customUUID = @"c97433f0-be8f-4dc8-b6f0-5343e6100eb4"; -} - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - // Custom initialization - UIButton *backButton = [UIButton buttonWithType:101]; // left-pointing shape - [backButton setTitle:@"Disconnect" forState:UIControlStateNormal]; - [backButton addTarget:self action:@selector(disconnect:) forControlEvents:UIControlEventTouchUpInside]; - - UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; - [[self navigationItem] setLeftBarButtonItem:backItem]; - - [[self navigationItem] setTitle:@"RFduino Bulk"]; - } - return self; -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - // Do any additional setup after loading the view from its nib. - - [rfduino setDelegate:self]; - - UIColor *start = [UIColor colorWithRed:58/255.0 green:108/255.0 blue:183/255.0 alpha:0.15]; - UIColor *stop = [UIColor colorWithRed:58/255.0 green:108/255.0 blue:183/255.0 alpha:0.45]; - - CAGradientLayer *gradient = [CAGradientLayer layer]; - gradient.frame = [self.view bounds]; - gradient.colors = [NSArray arrayWithObjects:(id)start.CGColor, (id)stop.CGColor, nil]; - [self.view.layer insertSublayer:gradient atIndex:0]; - - packets = 500; - ch = 'A'; - packet = 0; -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -- (IBAction)disconnect:(id)sender -{ - NSLog(@"disconnect pressed"); - - [rfduino disconnect]; -} - -- (void)didReceive:(NSData *)data -{ - // NSLog(@"RecievedRX"); - - /* - uint8_t *p = (uint8_t*)[data bytes]; - NSUInteger len = [data length]; - - // NSString *s = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; - // NSLog(@"%d=%@", len, s); - NSMutableString *s = [[NSMutableString alloc] init]; - - [s appendFormat:@"%d - ", len]; - - for (int i = 0; i < len; i++) - if (isprint(p[i])) - [s appendFormat:@"%c", p[i]]; - else - [s appendFormat:@"{%02x}", p[i]]; - - NSLog(@"%@", s); - */ - - if (packet == 0) - { - NSLog(@"start"); - start = CACurrentMediaTime(); - } - - uint8_t *p = (uint8_t*)[data bytes]; - NSUInteger len = [data length]; - - if (len != 20) - NSLog(@"len issue"); - for (int i = 0; i < 20; i++) - { - if (p[i] != ch) - NSLog(@"ch issue"); - ch++; - if (ch > 'Z') - ch = 'A'; - } - packet++; - if (packet >= packets) - { - NSLog(@"end"); - double end = CACurrentMediaTime(); - float secs = (end - start); - int bps = ((packets * 20) * 8) / secs; - NSLog(@"start: %f", start); - NSLog(@"end: %f", end); - NSLog(@"elapsed: %f", secs); - NSLog(@"kbps: %f", bps / 1000.0); - } -} - -@end diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/AppIcon.appiconset/Contents.json b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100755 index 91bf9c1..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/LaunchImage.launchimage/Contents.json b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100755 index 6f870a4..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/en.lproj/InfoPlist.strings b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/en.lproj/InfoPlist.strings deleted file mode 100755 index 477b28f..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/main.m b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/main.m deleted file mode 100755 index 8cadba0..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/main.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// main.m -// rfduinoBulkDataTransfer -// -// Created by Steve on 12/5/13. -// Copyright (c) 2013 RFduino. All rights reserved. -// - -#import - -#import "AppDelegate.h" - -int main(int argc, char * argv[]) -{ - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Info.plist b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Info.plist deleted file mode 100755 index 1087eed..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Info.plist +++ /dev/null @@ -1,45 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.RFduino.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - - diff --git a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch b/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch deleted file mode 100755 index 743435c..0000000 --- a/iPhone Apps/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer/rfduinoBulkDataTransfer-Prefix.pch +++ /dev/null @@ -1,16 +0,0 @@ -// -// Prefix header -// -// The contents of this file are implicitly included at the beginning of every source file. -// - -#import - -#ifndef __IPHONE_3_0 -#warning "This project uses features only available in iOS SDK 3.0 and later." -#endif - -#ifdef __OBJC__ - #import - #import -#endif diff --git a/iPhone Apps/rfduinoColorWheel/icon-144.png b/iPhone Apps/rfduinoColorWheel/icon-144.png deleted file mode 100755 index 1b20be2..0000000 Binary files a/iPhone Apps/rfduinoColorWheel/icon-144.png and /dev/null differ diff --git a/iPhone Apps/rfduinoColorWheel/icon-72.png b/iPhone Apps/rfduinoColorWheel/icon-72.png deleted file mode 100755 index ae9bae9..0000000 Binary files a/iPhone Apps/rfduinoColorWheel/icon-72.png and /dev/null differ diff --git a/iPhone Apps/rfduinoColorWheel/icon.png b/iPhone Apps/rfduinoColorWheel/icon.png deleted file mode 100755 index c8a9146..0000000 Binary files a/iPhone Apps/rfduinoColorWheel/icon.png and /dev/null differ diff --git a/iPhone Apps/rfduinoColorWheel/icon@2x.png b/iPhone Apps/rfduinoColorWheel/icon@2x.png deleted file mode 100755 index 82a0b27..0000000 Binary files a/iPhone Apps/rfduinoColorWheel/icon@2x.png and /dev/null differ diff --git a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.pbxproj b/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.pbxproj deleted file mode 100755 index 2152c44..0000000 --- a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.pbxproj +++ /dev/null @@ -1,367 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - AA07EB7D176BF80500AB755D /* CustomCellBackground.m in Sources */ = {isa = PBXBuildFile; fileRef = AA07EB7C176BF80500AB755D /* CustomCellBackground.m */; }; - AA9B326417B19E7700623C09 /* UIImage+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = AA9B326317B19E7700623C09 /* UIImage+Extras.m */; }; - AA9B326717B2930C00623C09 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = AA9B326517B2930C00623C09 /* icon-72.png */; }; - AA9B326817B2930C00623C09 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = AA9B326617B2930C00623C09 /* icon.png */; }; - AA9B326A17B2945300623C09 /* icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = AA9B326917B2945300623C09 /* icon-144.png */; }; - AAC4277816C9D86000149784 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAC4277716C9D86000149784 /* UIKit.framework */; }; - AAC4277A16C9D86000149784 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAC4277916C9D86000149784 /* Foundation.framework */; }; - AAC4277C16C9D86000149784 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAC4277B16C9D86000149784 /* CoreGraphics.framework */; }; - AAC4278216C9D86000149784 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AAC4278016C9D86000149784 /* InfoPlist.strings */; }; - AAC4278416C9D86000149784 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC4278316C9D86000149784 /* main.m */; }; - AAC4278A16C9D86000149784 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = AAC4278916C9D86000149784 /* Default.png */; }; - AAC4278C16C9D86000149784 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AAC4278B16C9D86000149784 /* Default@2x.png */; }; - AAC4278E16C9D86000149784 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AAC4278D16C9D86000149784 /* Default-568h@2x.png */; }; - AAC4279F16C9D86C00149784 /* RFduino.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC4279716C9D86C00149784 /* RFduino.m */; }; - AAC427A016C9D86C00149784 /* RfduinoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC4279A16C9D86C00149784 /* RfduinoManager.m */; }; - AAC427A116C9D86C00149784 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC4279D16C9D86C00149784 /* ScanViewController.m */; }; - AAC427AC16C9D8EB00149784 /* AppViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC427A716C9D8EB00149784 /* AppViewController.m */; }; - AAC427AD16C9D8EB00149784 /* AppViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = AAC427A816C9D8EB00149784 /* AppViewController.xib */; }; - AAC427AF16C9D8EB00149784 /* colorWheel1.png in Resources */ = {isa = PBXBuildFile; fileRef = AAC427AB16C9D8EB00149784 /* colorWheel1.png */; }; - AAC427B116C9DC3E00149784 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAC427B016C9DC3E00149784 /* CoreBluetooth.framework */; }; - AAC428C316C9FE3600149784 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AAC428C216C9FE3600149784 /* AppDelegate.m */; }; - AAE5C88416CDCBA1001005E3 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AAE5C88316CDCBA1001005E3 /* icon@2x.png */; }; - AAEE69D316D3F572005A5AEA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AAEE69D216D3F572005A5AEA /* QuartzCore.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - AA07EB7B176BF80500AB755D /* CustomCellBackground.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomCellBackground.h; sourceTree = ""; }; - AA07EB7C176BF80500AB755D /* CustomCellBackground.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomCellBackground.m; sourceTree = ""; }; - AA9B326217B19E7700623C09 /* UIImage+Extras.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Extras.h"; sourceTree = ""; }; - AA9B326317B19E7700623C09 /* UIImage+Extras.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Extras.m"; sourceTree = ""; }; - AA9B326517B2930C00623C09 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-72.png"; sourceTree = ""; }; - AA9B326617B2930C00623C09 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = ""; }; - AA9B326917B2945300623C09 /* icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon-144.png"; sourceTree = ""; }; - AAC4277316C9D86000149784 /* rfduinoColorWheel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rfduinoColorWheel.app; sourceTree = BUILT_PRODUCTS_DIR; }; - AAC4277716C9D86000149784 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - AAC4277916C9D86000149784 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - AAC4277B16C9D86000149784 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - AAC4277F16C9D86000149784 /* rfduinoColorWheel-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "rfduinoColorWheel-Info.plist"; sourceTree = ""; }; - AAC4278116C9D86000149784 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; - AAC4278316C9D86000149784 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - AAC4278516C9D86000149784 /* rfduinoColorWheel-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rfduinoColorWheel-Prefix.pch"; sourceTree = ""; }; - AAC4278916C9D86000149784 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; - AAC4278B16C9D86000149784 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - AAC4278D16C9D86000149784 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - AAC4279616C9D86C00149784 /* RFduino.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduino.h; sourceTree = ""; }; - AAC4279716C9D86C00149784 /* RFduino.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFduino.m; sourceTree = ""; }; - AAC4279816C9D86C00149784 /* RFduinoDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduinoDelegate.h; sourceTree = ""; }; - AAC4279916C9D86C00149784 /* RfduinoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RfduinoManager.h; sourceTree = ""; }; - AAC4279A16C9D86C00149784 /* RfduinoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RfduinoManager.m; sourceTree = ""; }; - AAC4279B16C9D86C00149784 /* RFduinoManagerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFduinoManagerDelegate.h; sourceTree = ""; }; - AAC4279C16C9D86C00149784 /* ScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanViewController.h; sourceTree = ""; }; - AAC4279D16C9D86C00149784 /* ScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanViewController.m; sourceTree = ""; }; - AAC427A616C9D8EB00149784 /* AppViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppViewController.h; sourceTree = ""; }; - AAC427A716C9D8EB00149784 /* AppViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppViewController.m; sourceTree = ""; }; - AAC427A816C9D8EB00149784 /* AppViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AppViewController.xib; sourceTree = ""; }; - AAC427AB16C9D8EB00149784 /* colorWheel1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = colorWheel1.png; sourceTree = ""; }; - AAC427B016C9DC3E00149784 /* CoreBluetooth.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreBluetooth.framework; path = System/Library/Frameworks/CoreBluetooth.framework; sourceTree = SDKROOT; }; - AAC428C116C9FE3600149784 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - AAC428C216C9FE3600149784 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - AAE5C88316CDCBA1001005E3 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon@2x.png"; sourceTree = ""; }; - AAEE69D216D3F572005A5AEA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - AAC4277016C9D86000149784 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AAEE69D316D3F572005A5AEA /* QuartzCore.framework in Frameworks */, - AAC427B116C9DC3E00149784 /* CoreBluetooth.framework in Frameworks */, - AAC4277816C9D86000149784 /* UIKit.framework in Frameworks */, - AAC4277A16C9D86000149784 /* Foundation.framework in Frameworks */, - AAC4277C16C9D86000149784 /* CoreGraphics.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - AAC4276816C9D86000149784 = { - isa = PBXGroup; - children = ( - AA9B326917B2945300623C09 /* icon-144.png */, - AA9B326517B2930C00623C09 /* icon-72.png */, - AA9B326617B2930C00623C09 /* icon.png */, - AAE5C88316CDCBA1001005E3 /* icon@2x.png */, - AAC4279416C9D86C00149784 /* rfduino */, - AAC4277D16C9D86000149784 /* rfduinoColorWheel */, - AAC4277616C9D86000149784 /* Frameworks */, - AAC4277416C9D86000149784 /* Products */, - ); - sourceTree = ""; - }; - AAC4277416C9D86000149784 /* Products */ = { - isa = PBXGroup; - children = ( - AAC4277316C9D86000149784 /* rfduinoColorWheel.app */, - ); - name = Products; - sourceTree = ""; - }; - AAC4277616C9D86000149784 /* Frameworks */ = { - isa = PBXGroup; - children = ( - AAEE69D216D3F572005A5AEA /* QuartzCore.framework */, - AAC427B016C9DC3E00149784 /* CoreBluetooth.framework */, - AAC4277716C9D86000149784 /* UIKit.framework */, - AAC4277916C9D86000149784 /* Foundation.framework */, - AAC4277B16C9D86000149784 /* CoreGraphics.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - AAC4277D16C9D86000149784 /* rfduinoColorWheel */ = { - isa = PBXGroup; - children = ( - AAC427A616C9D8EB00149784 /* AppViewController.h */, - AAC427A716C9D8EB00149784 /* AppViewController.m */, - AAC427A816C9D8EB00149784 /* AppViewController.xib */, - AA9B326217B19E7700623C09 /* UIImage+Extras.h */, - AA9B326317B19E7700623C09 /* UIImage+Extras.m */, - AAC427AB16C9D8EB00149784 /* colorWheel1.png */, - AAC4277E16C9D86000149784 /* Supporting Files */, - ); - path = rfduinoColorWheel; - sourceTree = ""; - }; - AAC4277E16C9D86000149784 /* Supporting Files */ = { - isa = PBXGroup; - children = ( - AAC4277F16C9D86000149784 /* rfduinoColorWheel-Info.plist */, - AAC4278016C9D86000149784 /* InfoPlist.strings */, - AAC4278316C9D86000149784 /* main.m */, - AAC4278516C9D86000149784 /* rfduinoColorWheel-Prefix.pch */, - AAC4278916C9D86000149784 /* Default.png */, - AAC4278B16C9D86000149784 /* Default@2x.png */, - AAC4278D16C9D86000149784 /* Default-568h@2x.png */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; - AAC4279416C9D86C00149784 /* rfduino */ = { - isa = PBXGroup; - children = ( - AAC428C116C9FE3600149784 /* AppDelegate.h */, - AAC428C216C9FE3600149784 /* AppDelegate.m */, - AAC4279616C9D86C00149784 /* RFduino.h */, - AAC4279716C9D86C00149784 /* RFduino.m */, - AAC4279816C9D86C00149784 /* RFduinoDelegate.h */, - AAC4279916C9D86C00149784 /* RfduinoManager.h */, - AAC4279A16C9D86C00149784 /* RfduinoManager.m */, - AAC4279B16C9D86C00149784 /* RFduinoManagerDelegate.h */, - AAC4279C16C9D86C00149784 /* ScanViewController.h */, - AAC4279D16C9D86C00149784 /* ScanViewController.m */, - AA07EB7B176BF80500AB755D /* CustomCellBackground.h */, - AA07EB7C176BF80500AB755D /* CustomCellBackground.m */, - ); - name = rfduino; - path = ../rfduino; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - AAC4277216C9D86000149784 /* rfduinoColorWheel */ = { - isa = PBXNativeTarget; - buildConfigurationList = AAC4279116C9D86000149784 /* Build configuration list for PBXNativeTarget "rfduinoColorWheel" */; - buildPhases = ( - AAC4276F16C9D86000149784 /* Sources */, - AAC4277016C9D86000149784 /* Frameworks */, - AAC4277116C9D86000149784 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = rfduinoColorWheel; - productName = rfduinoColorWheel; - productReference = AAC4277316C9D86000149784 /* rfduinoColorWheel.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - AAC4276A16C9D86000149784 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0450; - ORGANIZATIONNAME = OpenSourceRF; - }; - buildConfigurationList = AAC4276D16C9D86000149784 /* Build configuration list for PBXProject "rfduinoColorWheel" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = AAC4276816C9D86000149784; - productRefGroup = AAC4277416C9D86000149784 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - AAC4277216C9D86000149784 /* rfduinoColorWheel */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - AAC4277116C9D86000149784 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AAC4278216C9D86000149784 /* InfoPlist.strings in Resources */, - AAC4278A16C9D86000149784 /* Default.png in Resources */, - AAC4278C16C9D86000149784 /* Default@2x.png in Resources */, - AAC4278E16C9D86000149784 /* Default-568h@2x.png in Resources */, - AAC427AD16C9D8EB00149784 /* AppViewController.xib in Resources */, - AAC427AF16C9D8EB00149784 /* colorWheel1.png in Resources */, - AAE5C88416CDCBA1001005E3 /* icon@2x.png in Resources */, - AA9B326717B2930C00623C09 /* icon-72.png in Resources */, - AA9B326817B2930C00623C09 /* icon.png in Resources */, - AA9B326A17B2945300623C09 /* icon-144.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - AAC4276F16C9D86000149784 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - AAC4278416C9D86000149784 /* main.m in Sources */, - AAC4279F16C9D86C00149784 /* RFduino.m in Sources */, - AAC427A016C9D86C00149784 /* RfduinoManager.m in Sources */, - AAC427A116C9D86C00149784 /* ScanViewController.m in Sources */, - AAC427AC16C9D8EB00149784 /* AppViewController.m in Sources */, - AAC428C316C9FE3600149784 /* AppDelegate.m in Sources */, - AA07EB7D176BF80500AB755D /* CustomCellBackground.m in Sources */, - AA9B326417B19E7700623C09 /* UIImage+Extras.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - AAC4278016C9D86000149784 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - AAC4278116C9D86000149784 /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - AAC4278F16C9D86000149784 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - }; - name = Debug; - }; - AAC4279016C9D86000149784 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - AAC4279216C9D86000149784 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoColorWheel/rfduinoColorWheel-Prefix.pch"; - INFOPLIST_FILE = "rfduinoColorWheel/rfduinoColorWheel-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - AAC4279316C9D86000149784 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "rfduinoColorWheel/rfduinoColorWheel-Prefix.pch"; - INFOPLIST_FILE = "rfduinoColorWheel/rfduinoColorWheel-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - AAC4276D16C9D86000149784 /* Build configuration list for PBXProject "rfduinoColorWheel" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AAC4278F16C9D86000149784 /* Debug */, - AAC4279016C9D86000149784 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - AAC4279116C9D86000149784 /* Build configuration list for PBXNativeTarget "rfduinoColorWheel" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - AAC4279216C9D86000149784 /* Debug */, - AAC4279316C9D86000149784 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = AAC4276A16C9D86000149784 /* Project object */; -} diff --git a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100755 index e08107d..0000000 --- a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.h b/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.h deleted file mode 100755 index 48b805a..0000000 --- a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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 - -#import "RFduino.h" - -@interface AppViewController : UIViewController -{ - __weak IBOutlet UIImageView *colorWheel; - - __weak IBOutlet UIButton *colorSwatch; - - __weak IBOutlet UILabel *rLabel; - __weak IBOutlet UILabel *gLabel; - __weak IBOutlet UILabel *bLabel; - - __weak IBOutlet UISlider *rSlider; - __weak IBOutlet UISlider *gSlider; - __weak IBOutlet UISlider *bSlider; - - __weak IBOutlet UITextField *rValue; - __weak IBOutlet UITextField *gValue; - __weak IBOutlet UITextField *bValue; - - float red; - float green; - float blue; -} - -@property(strong, nonatomic) RFduino *rfduino; - -- (void) pickedColor:(UIColor*)color; - -- (IBAction)rSliderChanged:(id)sender; -- (IBAction)gSliderChanged:(id)sender; -- (IBAction)bSliderChanged:(id)sender; - -- (IBAction)rEditingDidEnd:(id)sender; -- (IBAction)gEditingDidEnd:(id)sender; -- (IBAction)bEditingDidEnd:(id)sender; - -@end diff --git a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.m b/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.m deleted file mode 100644 index 9db6f15..0000000 --- a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.m +++ /dev/null @@ -1,317 +0,0 @@ -/* - Copyright (c) 2013 OpenSourceRF.com. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - 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. -*/ - -#include - -#import "AppViewController.h" -#import "UIImage+Extras.h" - -@implementation AppViewController - -@synthesize rfduino; - -+ (void)load -{ - // customUUID = @"c97433f0-be8f-4dc8-b6f0-5343e6100eb4"; -} - -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ - self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; - if (self) { - // Custom initialization - UIButton *backButton = [UIButton buttonWithType:101]; // left-pointing shape - [backButton setTitle:@"Disconnect" forState:UIControlStateNormal]; - [backButton addTarget:self action:@selector(disconnect:) forControlEvents:UIControlEventTouchUpInside]; - - UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backButton]; - [[self navigationItem] setLeftBarButtonItem:backItem]; - - [[self navigationItem] setTitle:@"RFduino ColorWheel"]; - } - return self; -} - -- (void)manualLayout -{ - CGRect rect = [[UIScreen mainScreen] bounds]; - - if (UIDeviceOrientationIsLandscape(self.interfaceOrientation)) { - if (rect.size.height >= 1024) { // iPad - colorWheel.frame = CGRectMake(20,50,600,600); - - colorSwatch.frame = CGRectMake(667,260,330,16); - - rLabel.frame = CGRectMake(667,299,21,21); - gLabel.frame = CGRectMake(667,347,21,21); - bLabel.frame = CGRectMake(667,395,21,21); - - rSlider.frame = CGRectMake(694,300,242,23); - gSlider.frame = CGRectMake(694,348,242,23); - bSlider.frame = CGRectMake(694,396,242,23); - - rValue.frame = CGRectMake(950,296,45,30); - gValue.frame = CGRectMake(950,344,45,30); - bValue.frame = CGRectMake(950,392,45,30); - } else if (rect.size.height >= 568) { // iPhone 5 - colorWheel.frame = CGRectMake(7,7,250,250); - - colorSwatch.frame = CGRectMake(267,60,280,16); - - rLabel.frame = CGRectMake(267,89,21,21); - gLabel.frame = CGRectMake(267,127,21,21); - bLabel.frame = CGRectMake(267,165,21,21); - - rSlider.frame = CGRectMake(294,90,202,23); - gSlider.frame = CGRectMake(294,128,202,23); - bSlider.frame = CGRectMake(294,166,202,23); - - rValue.frame = CGRectMake(502,86,45,30); - gValue.frame = CGRectMake(502,124,45,30); - bValue.frame = CGRectMake(502,162,45,30); - } else { // iPhone 4S - colorWheel.frame = CGRectMake(0,7,250,250); - - colorSwatch.frame = CGRectMake(260,60,213,16); - - rLabel.frame = CGRectMake(260,89,21,21); - gLabel.frame = CGRectMake(260,127,21,21); - bLabel.frame = CGRectMake(260,165,21,21); - - rSlider.frame = CGRectMake(287,90,135,23); - gSlider.frame = CGRectMake(287,128,135,23); - bSlider.frame = CGRectMake(287,166,135,23); - - rValue.frame = CGRectMake(428,86,45,30); - gValue.frame = CGRectMake(428,124,45,30); - bValue.frame = CGRectMake(428,162,45,30); - } - } else { // UIDeviceOrientationIsPortrait(self.interfaceOrientation) - if (rect.size.height >= 1024) { // iPad - colorWheel.frame = CGRectMake(80,50,600,600); - - colorSwatch.frame = CGRectMake(40,704,685,16); - - rLabel.frame = CGRectMake(40,740,21,21); - gLabel.frame = CGRectMake(40,788,21,21); - bLabel.frame = CGRectMake(40,836,21,21); - - rSlider.frame = CGRectMake(67,741,602,23); - gSlider.frame = CGRectMake(67,789,602,23); - bSlider.frame = CGRectMake(67,837,602,23); - - rValue.frame = CGRectMake(680,737,45,30); - gValue.frame = CGRectMake(680,785,45,30); - bValue.frame = CGRectMake(680,833,45,30); - } else if (rect.size.height >= 568) { // iPhone 5 - colorWheel.frame = CGRectMake(35,20,250,250); - - colorSwatch.frame = CGRectMake(20,304,280,16); - - rLabel.frame = CGRectMake(20,330,21,21); - gLabel.frame = CGRectMake(20,368,21,21); - bLabel.frame = CGRectMake(20,406,21,21); - - rSlider.frame = CGRectMake(47,331,202,23); - gSlider.frame = CGRectMake(47,369,202,23); - bSlider.frame = CGRectMake(47,407,202,23); - - rValue.frame = CGRectMake(255,327,45,30); - gValue.frame = CGRectMake(255,365,45,30); - bValue.frame = CGRectMake(255,403,45,30); - } else { // iPhone 4S - colorWheel.frame = CGRectMake(35,13,250,250); - - colorSwatch.frame = CGRectMake(20,274,280,16); - - rLabel.frame = CGRectMake(20,300,21,21); - gLabel.frame = CGRectMake(20,338,21,21); - bLabel.frame = CGRectMake(20,376,21,21); - - rSlider.frame = CGRectMake(47,301,202,23); - gSlider.frame = CGRectMake(47,339,202,23); - bSlider.frame = CGRectMake(47,377,202,23); - - rValue.frame = CGRectMake(255,297,45,30); - gValue.frame = CGRectMake(255,335,45,30); - bValue.frame = CGRectMake(255,373,45,30); - } - } - - if (colorWheel.frame.size.width != colorWheel.image.size.width) { - UIImage *image1 = [UIImage imageNamed:@"colorWheel1.png"]; - UIImage *image2 = [image1 imageByScalingProportionallyToSize:colorWheel.frame.size]; - [colorWheel setImage:image2]; - } -} - -- (void)viewDidLoad -{ - [super viewDidLoad]; - - // Do any additional setup after loading the view from its nib. - - [rfduino setDelegate:self]; - - // delegate needed so UITextField textFieldShouldReturn can dismiss the keyboard when the return key is pressed - rValue.delegate = self; - gValue.delegate = self; - bValue.delegate = self; - - UIColor *start = [UIColor colorWithRed:102/255.0 green:102/255.0 blue:102/255.0 alpha:1.0]; - UIColor *stop = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0]; - - CAGradientLayer *gradient = [CAGradientLayer layer]; - //gradient.frame = [self.view bounds]; - gradient.frame = CGRectMake(0, 0, 1024, 1024); - gradient.colors = [NSArray arrayWithObjects:(id)start.CGColor, (id)stop.CGColor, nil]; - [self.view.layer insertSublayer:gradient atIndex:0]; - - // self.view.backgroundColor=[UIColor colorWithPatternImage:[UIImage imageNamed:@"background.png"]]; - - [self manualLayout]; -} - -- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration -{ - [self manualLayout]; -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -- (IBAction)disconnect:(id)sender -{ - NSLog(@"disconnect pressed"); - - [rfduino disconnect]; -} - -- (void)touchesEnded:(NSSet*)touches withEvent:(UIEvent*)event -{ - UITouch* touch = [touches anyObject]; - CGPoint point = [touch locationInView:colorWheel]; - if (CGRectContainsPoint(colorWheel.frame, point)) { - UIColor *color = [colorWheel.image pixelColorAt:point]; - [self pickedColor:color]; - } -} - -- (void)setColor -{ - NSLog(@"colors: RGB %f %f %f", red, green, blue); - - UIColor *color = [UIColor colorWithRed:red green:green blue:blue alpha:1.0]; - - [colorSwatch setHighlighted:YES]; - [colorSwatch setTintColor:color]; - - uint8_t tx[3] = { red * 255, green * 255, blue * 255 }; - NSData *data = [NSData dataWithBytes:(void*)&tx length:3]; - - [rfduino send:data]; -} - -- (void)pickedColor:(UIColor*)color -{ - NSLog(@"Picked Color"); - - const CGFloat *components = CGColorGetComponents([color CGColor]); - - red = components[0]; - green = components[1]; - blue = components[2]; - - rSlider.value = red; - gSlider.value = green; - bSlider.value = blue; - - rValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(red * 255)]; - gValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(green * 255)]; - bValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(blue * 255)]; - - [self setColor]; -} - -- (IBAction)rSliderChanged:(id)sender -{ - NSLog(@"rSliderChanged"); - red = [rSlider value]; - rValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(red * 255)]; - [self setColor]; -} - -- (IBAction)gSliderChanged:(id)sender -{ - NSLog(@"gSliderChanged"); - green = [gSlider value]; - gValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(green * 255)]; - [self setColor]; -} - -- (IBAction)bSliderChanged:(id)sender -{ - NSLog(@"bSliderChanged"); - blue = [bSlider value]; - bValue.text = [[NSString alloc] initWithFormat:@"%d", (int)(blue * 255)]; - [self setColor]; -} - -- (IBAction)rEditingDidEnd:(id)sender -{ - NSLog(@"rEditingDidEnd"); - red = rValue.text.intValue / 255.0; - rSlider.value = red; - [self setColor]; -} - -- (IBAction)gEditingDidEnd:(id)sender -{ - NSLog(@"gEditingDidEnd"); - green = gValue.text.intValue / 255.0; - gSlider.value = green; - [self setColor]; -} - -- (IBAction)bEditingDidEnd:(id)sender -{ - NSLog(@"bEditingDidEnd"); - blue = bValue.text.intValue / 255.0; - bSlider.value = blue; - [self setColor]; -} - -- (BOOL)textFieldShouldReturn:(UITextField *)textField -{ - NSLog(@"textFieldShouldReturn"); - [textField resignFirstResponder]; - return YES; -} - -@end diff --git a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.xib b/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.xib deleted file mode 100755 index 48cda74..0000000 --- a/iPhone Apps/rfduinoColorWheel/rfduinoColorWheel/AppViewController.xib +++ /dev/null @@ -1,717 +0,0 @@ - - - - 1552 - 12E55 - 3084 - 1187.39 - 626.00 -

- - IBProxyObject - IBUIButton - IBUIImageView - IBUILabel - IBUISlider - IBUITextField - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - -

- -