Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 804 → Rev 805

/iKopter/trunk/Classes/MainViewController.h
New file
0,0 → 1,52
// ///////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2010, Frank Blumenberg
//
// See License.txt for complete licensing and attribution information.
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//
// ///////////////////////////////////////////////////////////////////////////////
 
#import <UIKit/UIKit.h>
#import "InAppSettings.h"
 
typedef enum{
MKConnectionStateDisconnected,
MKConnectionStateConnecting,
MKConnectionStateConnected
} MKConnectionState;
 
@class MKHost;
 
@interface MainViewController : InAppSettingsViewController {
MKConnectionState connectionState;
MKHost* _host;
}
 
@property(nonatomic,retain) MKHost* host;
 
- (id)initWithHost:(MKHost*)theHost;
 
- (void)userDidDisconnect;
- (void)userDidCancelLastConnectRequest;
- (void)connectionRequestDidFail:(NSNotification *)aNotification;
- (void)connectionRequestDidSucceed:(NSNotification *)aNotification;
- (void)disconnected:(NSNotification *)aNotification;
 
@end
/iKopter/trunk/Classes/three20/TTCorePreprocessorMacros.h
New file
0,0 → 1,60
//
// Copyright 2009-2010 Facebook
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
 
/**
* Borrowed from Apple's AvailabiltyInternal.h header. There's no reason why we shouldn't be
* able to use this macro, as it's a gcc-supported flag.
* Here's what we based it off of.
* __AVAILABILITY_INTERNAL_DEPRECATED __attribute__((deprecated))
*/
#define __TTDEPRECATED_METHOD __attribute__((deprecated))
 
///////////////////////////////////////////////////////////////////////////////////////////////////
// Errors
 
#define TT_ERROR_DOMAIN @"three20.net"
 
#define TT_EC_INVALID_IMAGE 101
 
 
///////////////////////////////////////////////////////////////////////////////////////////////////
// Flags
 
/**
* For when the flag might be a set of bits, this will ensure that the exact set of bits in
* the flag have been set in the value.
*/
#define IS_MASK_SET(value, flag) (((value) & (flag)) == (flag))
 
 
///////////////////////////////////////////////////////////////////////////////////////////////////
// Time
 
#define TT_MINUTE 60
#define TT_HOUR (60 * TT_MINUTE)
#define TT_DAY (24 * TT_HOUR)
#define TT_WEEK (7 * TT_DAY)
#define TT_MONTH (30.5 * TT_DAY)
#define TT_YEAR (365 * TT_DAY)
 
///////////////////////////////////////////////////////////////////////////////////////////////////
// Safe releases
 
#define TT_RELEASE_SAFELY(__POINTER) { [__POINTER release]; __POINTER = nil; }
#define TT_INVALIDATE_TIMER(__TIMER) { [__TIMER invalidate]; __TIMER = nil; }
 
// Release a CoreFoundation object safely.
#define TT_RELEASE_CF_SAFELY(__REF) { if (nil != (__REF)) { CFRelease(__REF); __REF = nil; } }
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTGlobalCore.h
===================================================================
--- trunk/Classes/three20/TTGlobalCore.h (revision 0)
+++ trunk/Classes/three20/TTGlobalCore.h (revision 805)
@@ -0,0 +1,52 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ * Creates a mutable array which does not retain references to the objects it contains.
+ *
+ * Typically used with arrays of delegates.
+ */
+NSMutableArray* TTCreateNonRetainingArray();
+
+/**
+ * Creates a mutable dictionary which does not retain references to the values it contains.
+ *
+ * Typically used with dictionaries of delegates.
+ */
+NSMutableDictionary* TTCreateNonRetainingDictionary();
+
+/**
+ * Tests if an object is an array which is not empty.
+ */
+BOOL TTIsArrayWithItems(id object);
+
+/**
+ * Tests if an object is a set which is not empty.
+ */
+BOOL TTIsSetWithItems(id object);
+
+/**
+ * Tests if an object is a string which is not empty.
+ */
+BOOL TTIsStringWithAnyText(id object);
+
+/**
+ * Swap the two method implementations on the given class.
+ * Uses method_exchangeImplementations to accomplish this.
+ */
+void TTSwapMethods(Class cls, SEL originalSel, SEL newSel);
/trunk/Classes/three20/TTGlobalCore.h
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTGlobalCorePaths.h
===================================================================
--- trunk/Classes/three20/TTGlobalCorePaths.h (revision 0)
+++ trunk/Classes/three20/TTGlobalCorePaths.h (revision 805)
@@ -0,0 +1,37 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+/**
+ * @return YES if the URL begins with "bundle://"
+ */
+BOOL TTIsBundleURL(NSString* URL);
+
+/**
+ * @return YES if the URL begins with "documents://"
+ */
+BOOL TTIsDocumentsURL(NSString* URL);
+
+/**
+ * @return The main bundle path concatenated with the given relative path.
+ */
+NSString* TTPathForBundleResource(NSString* relativePath);
+
+/**
+ * @return The documents path concatenated with the given relative path.
+ */
+NSString* TTPathForDocumentsResource(NSString* relativePath);
/trunk/Classes/three20/TTGlobalCorePaths.h
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTActivityLabel.h
===================================================================
--- trunk/Classes/three20/TTActivityLabel.h (revision 0)
+++ trunk/Classes/three20/TTActivityLabel.h (revision 805)
@@ -0,0 +1,59 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef enum {
+ TTActivityLabelStyleWhite,
+ TTActivityLabelStyleGray,
+ TTActivityLabelStyleBlackBox,
+ TTActivityLabelStyleBlackBezel,
+ TTActivityLabelStyleBlackBanner,
+ TTActivityLabelStyleWhiteBezel,
+ TTActivityLabelStyleWhiteBox
+} TTActivityLabelStyle;
+
+@class TTView;
+@class TTButton;
+
+@interface TTActivityLabel : UIView {
+ TTActivityLabelStyle _style;
+
+ UIView* _bezelView;
+ UIProgressView* _progressView;
+ UIActivityIndicatorView* _activityIndicator;
+ UILabel* _label;
+
+ float _progress;
+ BOOL _smoothesProgress;
+ NSTimer* _smoothTimer;
+}
+
+@property (nonatomic, readonly) TTActivityLabelStyle style;
+
+@property (nonatomic, assign) NSString* text;
+@property (nonatomic, assign) UIFont* font;
+
+@property (nonatomic) float progress;
+@property (nonatomic) BOOL isAnimating;
+@property (nonatomic) BOOL smoothesProgress;
+
+- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style;
+- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style text:(NSString*)text;
+- (id)initWithStyle:(TTActivityLabelStyle)style;
+
+@end
/trunk/Classes/three20/TTActivityLabel.h
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTGlobalCore.m
===================================================================
--- trunk/Classes/three20/TTGlobalCore.m (revision 0)
+++ trunk/Classes/three20/TTGlobalCore.m (revision 805)
@@ -0,0 +1,68 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "TTGlobalCore.h"
+
+#import <objc/runtime.h>
+
+// No-ops for non-retaining objects.
+static const void* TTRetainNoOp(CFAllocatorRef allocator, const void *value) { return value; }
+static void TTReleaseNoOp(CFAllocatorRef allocator, const void *value) { }
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+NSMutableArray* TTCreateNonRetainingArray() {
+ CFArrayCallBacks callbacks = kCFTypeArrayCallBacks;
+ callbacks.retain = TTRetainNoOp;
+ callbacks.release = TTReleaseNoOp;
+ return (NSMutableArray*)CFArrayCreateMutable(nil, 0, &callbacks);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+NSMutableDictionary* TTCreateNonRetainingDictionary() {
+ CFDictionaryKeyCallBacks keyCallbacks = kCFTypeDictionaryKeyCallBacks;
+ CFDictionaryValueCallBacks callbacks = kCFTypeDictionaryValueCallBacks;
+ callbacks.retain = TTRetainNoOp;
+ callbacks.release = TTReleaseNoOp;
+ return (NSMutableDictionary*)CFDictionaryCreateMutable(nil, 0, &keyCallbacks, &callbacks);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+BOOL TTIsArrayWithItems(id object) {
+ return [object isKindOfClass:[NSArray class]] && [(NSArray*)object count] > 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+BOOL TTIsSetWithItems(id object) {
+ return [object isKindOfClass:[NSSet class]] && [(NSSet*)object count] > 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+BOOL TTIsStringWithAnyText(id object) {
+ return [object isKindOfClass:[NSString class]] && [(NSString*)object length] > 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void TTSwapMethods(Class cls, SEL originalSel, SEL newSel) {
+ Method originalMethod = class_getInstanceMethod(cls, originalSel);
+ Method newMethod = class_getInstanceMethod(cls, newSel);
+ method_exchangeImplementations(originalMethod, newMethod);
+}
/trunk/Classes/three20/TTGlobalCore.m
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTGlobalCorePaths.m
===================================================================
--- trunk/Classes/three20/TTGlobalCorePaths.m (revision 0)
+++ trunk/Classes/three20/TTGlobalCorePaths.m (revision 805)
@@ -0,0 +1,48 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "TTGlobalCorePaths.h"
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+BOOL TTIsBundleURL(NSString* URL) {
+ return [URL hasPrefix:@"bundle://"];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+BOOL TTIsDocumentsURL(NSString* URL) {
+ return [URL hasPrefix:@"documents://"];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+NSString* TTPathForBundleResource(NSString* relativePath) {
+ NSString* resourcePath = [[NSBundle mainBundle] resourcePath];
+ return [resourcePath stringByAppendingPathComponent:relativePath];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+NSString* TTPathForDocumentsResource(NSString* relativePath) {
+ static NSString* documentsPath = nil;
+ if (!documentsPath) {
+ NSArray* dirs = NSSearchPathForDirectoriesInDomains(
+ NSDocumentDirectory, NSUserDomainMask, YES);
+ documentsPath = [[dirs objectAtIndex:0] retain];
+ }
+ return [documentsPath stringByAppendingPathComponent:relativePath];
+}
/trunk/Classes/three20/TTGlobalCorePaths.m
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/three20/TTActivityLabel.m
===================================================================
--- trunk/Classes/three20/TTActivityLabel.m (revision 0)
+++ trunk/Classes/three20/TTActivityLabel.m (revision 805)
@@ -0,0 +1,347 @@
+//
+// Copyright 2009-2010 Facebook
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "Three20UI/TTActivityLabel.h"
+
+// UI
+#import "Three20UI/TTView.h"
+#import "Three20UI/TTButton.h"
+#import "Three20UI/UIViewAdditions.h"
+
+// UINavigator
+#import "Three20UINavigator/TTGlobalNavigatorMetrics.h"
+
+// Style
+#import "Three20Style/TTGlobalStyle.h"
+#import "Three20Style/TTDefaultStyleSheet.h"
+#import "Three20Style/UIFontAdditions.h"
+
+// Core
+#import "Three20Core/TTCorePreprocessorMacros.h"
+
+static CGFloat kMargin = 10;
+static CGFloat kPadding = 15;
+static CGFloat kBannerPadding = 8;
+static CGFloat kSpacing = 6;
+static CGFloat kProgressMargin = 6;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+@implementation TTActivityLabel
+
+@synthesize style = _style;
+@synthesize progress = _progress;
+@synthesize smoothesProgress = _smoothesProgress;
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style text:(NSString*)text {
+ if (self = [super initWithFrame:frame]) {
+ _style = style;
+ _progress = 0;
+ _smoothesProgress = NO;
+ _smoothTimer =nil;
+ _progressView = nil;
+
+ _bezelView = [[TTView alloc] init];
+ if (_style == TTActivityLabelStyleBlackBezel) {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ _bezelView.style = TTSTYLE(blackBezel);
+ self.backgroundColor = [UIColor clearColor];
+ } else if (_style == TTActivityLabelStyleWhiteBezel) {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ _bezelView.style = TTSTYLE(whiteBezel);
+ self.backgroundColor = [UIColor clearColor];
+ } else if (_style == TTActivityLabelStyleWhiteBox) {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ self.backgroundColor = [UIColor whiteColor];
+ } else if (_style == TTActivityLabelStyleBlackBox) {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.8];
+ } else if (_style == TTActivityLabelStyleBlackBanner) {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ _bezelView.style = TTSTYLE(blackBanner);
+ self.backgroundColor = [UIColor clearColor];
+ } else {
+ _bezelView.backgroundColor = [UIColor clearColor];
+ self.backgroundColor = [UIColor clearColor];
+ }
+
+ self.autoresizingMask =
+ UIViewAutoresizingFlexibleWidth |
+ UIViewAutoresizingFlexibleHeight;
+
+ _label = [[UILabel alloc] init];
+ _label.text = text;
+ _label.backgroundColor = [UIColor clearColor];
+ _label.lineBreakMode = UILineBreakModeTailTruncation;
+
+ if (_style == TTActivityLabelStyleWhite) {
+ _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:
+ UIActivityIndicatorViewStyleWhite];
+ _label.font = TTSTYLEVAR(activityLabelFont);
+ _label.textColor = [UIColor whiteColor];
+ } else if (_style == TTActivityLabelStyleGray
+ || _style == TTActivityLabelStyleWhiteBox
+ || _style == TTActivityLabelStyleWhiteBezel) {
+ _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:
+ UIActivityIndicatorViewStyleGray];
+ _label.font = TTSTYLEVAR(activityLabelFont);
+ _label.textColor = TTSTYLEVAR(tableActivityTextColor);
+ } else if (_style == TTActivityLabelStyleBlackBezel || _style == TTActivityLabelStyleBlackBox) {
+ _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:
+ UIActivityIndicatorViewStyleWhiteLarge];
+ _activityIndicator.frame = CGRectMake(0, 0, 24, 24);
+ _label.font = TTSTYLEVAR(activityLabelFont);
+ _label.textColor = [UIColor whiteColor];
+ _label.shadowColor = [UIColor colorWithWhite:0 alpha:0.3];
+ _label.shadowOffset = CGSizeMake(1, 1);
+ } else if (_style == TTActivityLabelStyleBlackBanner) {
+ _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:
+ UIActivityIndicatorViewStyleWhite];
+ _label.font = TTSTYLEVAR(activityBannerFont);
+ _label.textColor = [UIColor whiteColor];
+ _label.shadowColor = [UIColor colorWithWhite:0 alpha:0.3];
+ _label.shadowOffset = CGSizeMake(1, 1);
+ }
+
+ [self addSubview:_bezelView];
+ [_bezelView addSubview:_activityIndicator];
+ [_bezelView addSubview:_label];
+ [_activityIndicator startAnimating];
+ }
+ return self;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (id)initWithFrame:(CGRect)frame style:(TTActivityLabelStyle)style {
+ if (self = [self initWithFrame:frame style:style text:nil]) {
+ }
+
+ return self;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (id)initWithStyle:(TTActivityLabelStyle)style {
+ if (self = [self initWithFrame:CGRectZero style:style text:nil]) {
+ }
+
+ return self;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (id)initWithFrame:(CGRect)frame {
+ if (self = [self initWithFrame:frame style:TTActivityLabelStyleWhiteBox text:nil]) {
+ }
+
+ return self;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)dealloc {
+ TT_INVALIDATE_TIMER(_smoothTimer);
+ TT_RELEASE_SAFELY(_bezelView);
+ TT_RELEASE_SAFELY(_progressView);
+ TT_RELEASE_SAFELY(_activityIndicator);
+ TT_RELEASE_SAFELY(_label);
+ [super dealloc];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark UIView
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)layoutSubviews {
+ [super layoutSubviews];
+
+ CGSize textSize = [_label.text sizeWithFont:_label.font];
+
+ CGFloat indicatorSize = 0;
+ [_activityIndicator sizeToFit];
+ if (_activityIndicator.isAnimating) {
+ if (_activityIndicator.height > textSize.height) {
+ indicatorSize = textSize.height;
+ } else {
+ indicatorSize = _activityIndicator.height;
+ }
+ }
+
+ CGFloat contentWidth = indicatorSize + kSpacing + textSize.width;
+ CGFloat contentHeight = textSize.height > indicatorSize ? textSize.height : indicatorSize;
+
+ if (_progressView) {
+ [_progressView sizeToFit];
+ contentHeight += _progressView.height + kSpacing;
+ }
+
+ CGFloat margin, padding, bezelWidth, bezelHeight;
+ if (_style == TTActivityLabelStyleBlackBezel || _style == TTActivityLabelStyleWhiteBezel) {
+ margin = kMargin;
+ padding = kPadding;
+ bezelWidth = contentWidth + padding*2;
+ bezelHeight = contentHeight + padding*2;
+ } else {
+ margin = 0;
+ padding = kBannerPadding;
+ bezelWidth = self.width;
+ bezelHeight = self.height;
+ }
+
+ CGFloat maxBevelWidth = TTScreenBounds().size.width - margin*2;
+ if (bezelWidth > maxBevelWidth) {
+ bezelWidth = maxBevelWidth;
+ contentWidth = bezelWidth - (kSpacing + indicatorSize);
+ }
+
+ CGFloat textMaxWidth = (bezelWidth - (indicatorSize + kSpacing)) - padding*2;
+ CGFloat textWidth = textSize.width;
+ if (textWidth > textMaxWidth) {
+ textWidth = textMaxWidth;
+ }
+
+ _bezelView.frame = CGRectMake(floor(self.width/2 - bezelWidth/2),
+ floor(self.height/2 - bezelHeight/2),
+ bezelWidth, bezelHeight);
+
+ CGFloat y = padding + floor((bezelHeight - padding*2)/2 - contentHeight/2);
+
+ if (_progressView) {
+ if (_style == TTActivityLabelStyleBlackBanner) {
+ y += kBannerPadding/2;
+ }
+ _progressView.frame = CGRectMake(kProgressMargin, y,
+ bezelWidth - kProgressMargin*2, _progressView.height);
+ y += _progressView.height + kSpacing-1;
+ }
+
+ _label.frame = CGRectMake(floor((bezelWidth/2 - contentWidth/2) + indicatorSize + kSpacing), y,
+ textWidth, textSize.height);
+
+ _activityIndicator.frame = CGRectMake(_label.left - (indicatorSize+kSpacing), y,
+ indicatorSize, indicatorSize);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (CGSize)sizeThatFits:(CGSize)size {
+ CGFloat padding;
+ if (_style == TTActivityLabelStyleBlackBezel || _style == TTActivityLabelStyleWhiteBezel) {
+ padding = kPadding;
+ } else {
+ padding = kBannerPadding;
+ }
+
+ CGFloat height = _label.font.ttLineHeight + padding*2;
+ if (_progressView) {
+ height += _progressView.height + kSpacing;
+ }
+
+ return CGSizeMake(size.width, height);
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)smoothTimer {
+ if (_progressView.progress < _progress) {
+ _progressView.progress += 0.01;
+ } else {
+ TT_INVALIDATE_TIMER(_smoothTimer);
+ }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Public
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (NSString*)text {
+ return _label.text;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setText:(NSString*)text {
+ _label.text = text;
+ [self setNeedsLayout];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (UIFont*)font {
+ return _label.font;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setFont:(UIFont*)font {
+ _label.font = font;
+ [self setNeedsLayout];
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (BOOL)isAnimating {
+ return _activityIndicator.isAnimating;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setIsAnimating:(BOOL)isAnimating {
+ if (isAnimating) {
+ [_activityIndicator startAnimating];
+
+ } else {
+ [_activityIndicator stopAnimating];
+ }
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)setProgress:(float)progress {
+ _progress = progress;
+
+ if (!_progressView) {
+ _progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
+ _progressView.progress = 0;
+ [_bezelView addSubview:_progressView];
+ [self setNeedsLayout];
+ }
+
+ if (_smoothesProgress) {
+ if (!_smoothTimer) {
+ _smoothTimer = [NSTimer scheduledTimerWithTimeInterval:0.01 target:self
+ selector:@selector(smoothTimer) userInfo:nil repeats:YES];
+ }
+ } else {
+ _progressView.progress = progress;
+ }
+}
+
+
+@end
/trunk/Classes/three20/TTActivityLabel.m
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: trunk/Classes/RootViewController.m
===================================================================
--- trunk/Classes/RootViewController.m (revision 0)
+++ trunk/Classes/RootViewController.m (revision 805)
@@ -0,0 +1,216 @@
+//
+// RootViewController.m
+// iKopter
+//
+// Created by Frank Blumenberg on 20.06.10.
+// Copyright de.frankblumenberg 2010. All rights reserved.
+//
+
+#import "RootViewController.h"
+#import "MainViewController.h"
+
+#import "MKHosts.h";
+#import "MKHost.h";
+#import "MKHostViewController.h"
+#import "MKConnectionController.h"
+
+@implementation RootViewController
+
+
+#pragma mark -
+#pragma mark View lifecycle
+
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ self.title = @"µKopter";
+
+ hosts=[[MKHosts alloc]init];
+
+ UIBarButtonItem* addButton;
+ addButton = [[[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemAdd
+ target:self
+ action:@selector(addHost)] autorelease];
+ addButton.style = UIBarButtonItemStyleBordered;
+
+ UIBarButtonItem* spacerButton;
+ spacerButton = [[[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+ target:nil
+ action:nil] autorelease];
+
+ [self setToolbarItems:[NSArray arrayWithObjects:self.editButtonItem,spacerButton,addButton,nil]];
+
+ self.tableView.allowsSelectionDuringEditing=YES;
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ self.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+ [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
+
+ [self.navigationController setToolbarHidden:NO animated:NO];
+ [[MKConnectionController sharedMKConnectionController] stop];
+
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+
+ if(self.tableView.editing ) {
+
+ if( editingHost ) {
+
+ NSArray* indexPaths=[NSArray arrayWithObject:editingHost];
+
+ NSLog(@"appear reload %@",indexPaths);
+ [self.tableView beginUpdates];
+ [self.tableView reloadRowsAtIndexPaths:indexPaths
+ withRowAnimation:UITableViewRowAnimationFade];
+ [self.tableView endUpdates];
+
+ editingHost=nil;
+ }
+ }
+}
+
+
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ return YES; //(interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view data source
+
+// Customize the number of sections in the table view.
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+
+// Customize the number of rows in the table view.
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [hosts count];
+}
+
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ NSLog(@"cellForRowAtIndexPath %@",indexPath);
+
+ static NSString *CellIdentifier = @"MKHostCell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ MKHost* host = [hosts hostAtIndexPath:indexPath];
+
+ cell.textLabel.text = host.name;
+ cell.detailTextLabel.text = host.address;
+ cell.editingAccessoryType = UITableViewCellAccessoryDisclosureIndicator;
+
+ return cell;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+ // Return NO if you do not want the specified item to be editable.
+ return YES;
+}
+
+
+// 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.
+ [hosts deleteHostAtIndexPath:indexPath];
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject: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.
+ }
+}
+
+- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+ [hosts moveHostAtIndexPath:fromIndexPath toIndexPath:toIndexPath];
+}
+
+- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+ return YES;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ MKHost* host=[hosts hostAtIndexPath:indexPath];
+ if (self.tableView.editing ) {
+ MKHostViewController* hostView = [[MKHostViewController alloc] initWithHost:host];
+ editingHost = indexPath;
+ [self.navigationController pushViewController:hostView animated:YES];
+ [hostView release];
+ }
+ else {
+ MainViewController* mainView = [[MainViewController alloc] initWithHost:host];
+ [self.navigationController pushViewController:mainView animated:YES];
+ [mainView release];
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (void)addHost {
+
+ editingHost=[hosts addHost];
+
+ NSArray* indexPaths=[NSArray arrayWithObject:editingHost];
+
+ [self.tableView beginUpdates];
+ [self.tableView insertRowsAtIndexPaths:indexPaths
+ withRowAnimation:UITableViewRowAnimationFade];
+ [self.tableView endUpdates];
+
+ MKHost* host=[hosts hostAtIndexPath:editingHost];
+ MKHostViewController* hostView = [[MKHostViewController alloc] initWithHost:host];
+ [self.navigationController pushViewController:hostView animated:YES];
+ [hostView release];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Relinquish ownership any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ [hosts release];
+ hosts = nil;
+}
+
+- (void)dealloc {
+ [hosts release];
+ [super dealloc];
+}
+
+
+@end
+
Index: trunk/Classes/MainViewController.m
===================================================================
--- trunk/Classes/MainViewController.m (revision 0)
+++ trunk/Classes/MainViewController.m (revision 805)
@@ -0,0 +1,253 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "MainViewController.h"
+#import "MKHost.h"
+#import "GradientButton.h"
+
+#import "MKConnectionController.h"
+#import "MKDataConstants.h"
+
+
+@implementation MainViewController
+
+@synthesize host=_host;
+
+#pragma mark -
+
+- (id)initWithHost:(MKHost*)theHost {
+
+ if ((self = [super initWithFile:@"Main"])) {
+ self.title = theHost.name;
+ self.host = theHost;
+ super.dataSource = nil;
+
+ connectionState=MKConnectionStateDisconnected;
+ }
+
+ return self;
+}
+
+- (void)dealloc {
+
+ self.host = nil;
+ [_host release];
+ [super dealloc];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (void)viewDidLoad {
+
+ [super viewDidLoad];
+
+ //Create an instance of activity indicator view
+ UIActivityIndicatorView * activityIndicator = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
+ //set the initial property
+ [activityIndicator stopAnimating];
+ [activityIndicator hidesWhenStopped];
+
+ //Create an instance of Bar button item with custome view which is of activity indicator
+ UIBarButtonItem * barButton = [[UIBarButtonItem alloc] initWithCustomView:activityIndicator];
+
+ //Set the bar button the navigation bar
+ [self navigationItem].rightBarButtonItem = barButton;
+
+ //Memory clean up
+ [activityIndicator release];
+ [barButton release];
+
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+
+ NSNotificationCenter* nc=[NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(connectionRequestDidSucceed:)
+ name:MKConnectedNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(disconnected:)
+ name:MKDisconnectedNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(connectionRequestDidFail:)
+ name:MKDisconnectErrorNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(versionResponse:)
+ name:MKVersionNotification
+ object:nil];
+
+ [self.navigationController setToolbarHidden:NO animated:NO];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ if( ![[MKConnectionController sharedMKConnectionController] isRunning]) {
+
+ self.settingsTableView.userInteractionEnabled=NO;
+ [(UIActivityIndicatorView *)[self navigationItem].rightBarButtonItem.customView startAnimating];
+ [[MKConnectionController sharedMKConnectionController] start:self.host];
+
+ }
+ else {
+ [[MKConnectionController sharedMKConnectionController] activateNaviCtrl];
+ }
+
+ [self.settingsTableView deselectRowAtIndexPath:[self.settingsTableView indexPathForSelectedRow] animated:YES];
+}
+
+-(void) viewWillDisappear:(BOOL)animated {
+ NSNotificationCenter* nc=[NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+}
+
+- (void)viewDidUnload {
+ [[MKConnectionController sharedMKConnectionController] stop];
+}
+
+/*
+ // Override to allow orientations other than the default portrait orientation.
+ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+ }
+ */
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view data source
+
+// Customize the number of sections in the table view.
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+
+ if(connectionState==MKConnectionStateConnected )
+ return [super numberOfSectionsInTableView:tableView];
+
+ return 1;
+}
+
+// Customize the number of rows in the table view.
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+
+ DLog(@"%d state %d",section,connectionState);
+
+ if(connectionState==MKConnectionStateConnected )
+ return [super tableView:tableView numberOfRowsInSection:section];
+
+ return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ DLog(@"%@ state %d",indexPath,connectionState);
+
+ if(connectionState==MKConnectionStateConnected )
+ return [super tableView:tableView cellForRowAtIndexPath:indexPath];
+
+ static NSString *CellIdentifier = @"MKConnectionCell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ cell.textLabel.text = NSLocalizedString(@"Connecting…",@"Text connecting label");
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ cell.accessoryType = UITableViewCellAccessoryNone;
+
+ return cell;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Connection status actions (Statemachine)
+
+- (void)userDidDisconnect;
+{
+ [[MKConnectionController sharedMKConnectionController] stop];
+}
+
+- (void)userDidCancelLastConnectRequest;
+{
+ [[MKConnectionController sharedMKConnectionController] stop];
+ connectionState=MKConnectionStateDisconnected;
+ [self.settingsTableView reloadData];
+}
+
+- (void)connectionRequestDidFail:(NSNotification *)aNotification;
+{
+ NSError* err = [[aNotification userInfo] objectForKey:@"error"];
+
+ UIAlertView *alert = [[UIAlertView alloc]
+ initWithTitle:NSLocalizedString(@"Server error", @"Server error")
+ message:[err localizedDescription]
+ delegate:self
+ cancelButtonTitle:@"Ok"
+ otherButtonTitles:nil];
+ [alert show];
+ [alert release];
+
+ connectionState=MKConnectionStateDisconnected;
+ [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+- (void)connectionRequestDidSucceed:(NSNotification *)aNotification;
+{
+ DLog(@"Got connected");
+ self.settingsTableView.userInteractionEnabled=YES;
+
+ connectionState=MKConnectionStateConnected;
+
+ [self.settingsTableView beginUpdates];
+ [self.settingsTableView reloadSections:[NSIndexSet indexSetWithIndex:0] withRowAnimation:UITableViewRowAnimationFade];
+ [self.settingsTableView endUpdates];
+
+ [(UIActivityIndicatorView *)[self navigationItem].rightBarButtonItem.customView stopAnimating];
+
+ [[MKConnectionController sharedMKConnectionController] activateNaviCtrl];
+}
+
+- (void)disconnected:(NSNotification *)aNotification;
+{
+ connectionState=MKConnectionStateDisconnected;
+ [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+- (void)versionResponse:(NSNotification *)aNotification;
+{
+// self.versionString = [[MKConnectionController sharedMKConnectionController]longVersionForAddress:MKAddressFC];
+// [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:CONNECT_SECTIONID] withRowAnimation:UITableViewRowAnimationNone];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+@end
Index: trunk/Classes/GradientButton.h
===================================================================
--- trunk/Classes/GradientButton.h (revision 0)
+++ trunk/Classes/GradientButton.h (revision 805)
@@ -0,0 +1,44 @@
+//
+// ButtonGradientView.h
+// Custom Alert View
+//
+// Created by jeff on 5/17/10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <QuartzCore/QuartzCore.h>
+#import <CoreGraphics/CoreGraphics.h>
+
+@interface GradientButton : UIButton
+{
+ // These two arrays define the gradient that will be used
+ // when the button is in UIControlStateNormal
+ NSArray *normalGradientColors; // Colors
+ NSArray *normalGradientLocations; // Relative locations
+
+ // These two arrays define the gradient that will be used
+ // when the button is in UIControlStateHighlighted
+ NSArray *highlightGradientColors; // Colors
+ NSArray *highlightGradientLocations; // Relative locations
+
+ // This defines the corner radius of the button
+ CGFloat cornerRadius;
+
+
+@private
+ CGGradientRef normalGradient;
+ CGGradientRef highlightGradient;
+}
+@property (nonatomic, retain) NSArray *normalGradientColors;
+@property (nonatomic, retain) NSArray *normalGradientLocations;
+@property (nonatomic, retain) NSArray *highlightGradientColors;
+@property (nonatomic, retain) NSArray *highlightGradientLocations;
+@property (nonatomic) CGFloat cornerRadius;
+
+- (void)useAlertStyle;
+- (void)useRedDeleteStyle;
+- (void)useWhiteStyle;
+- (void)useBlackStyle;
+- (void)useSimpleOrangeStyle;
+@end
Index: trunk/Classes/GradientButton.m
===================================================================
--- trunk/Classes/GradientButton.m (revision 0)
+++ trunk/Classes/GradientButton.m (revision 805)
@@ -0,0 +1,446 @@
+//
+// ButtonGradientView.m
+// Custom Alert View
+//
+// Created by jeff on 5/17/10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "GradientButton.h"
+
+@interface GradientButton()
+@property (nonatomic, readonly) CGGradientRef normalGradient;
+@property (nonatomic, readonly) CGGradientRef highlightGradient;
+- (void)hesitateUpdate; // Used to catch and fix problem where quick taps don't get updated back to normal state
+@end
+#pragma mark -
+
+@implementation GradientButton
+@synthesize normalGradientColors;
+@synthesize normalGradientLocations;
+@synthesize highlightGradientColors;
+@synthesize highlightGradientLocations;
+@synthesize cornerRadius;
+@synthesize normalGradient, highlightGradient;
+#pragma mark -
+- (CGGradientRef)normalGradient
+{
+ if (normalGradient == NULL)
+ {
+ int locCount = [normalGradientLocations count];
+ CGFloat locations[locCount];
+ for (int i = 0; i < [normalGradientLocations count]; i++)
+ {
+ NSNumber *location = [normalGradientLocations objectAtIndex:i];
+ locations[i] = [location floatValue];
+ }
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+ normalGradient = CGGradientCreateWithColors(space, (CFArrayRef)normalGradientColors, locations);
+ CGColorSpaceRelease(space);
+ }
+ return normalGradient;
+}
+- (CGGradientRef)highlightGradient
+{
+
+ if (highlightGradient == NULL)
+ {
+ CGFloat locations[[highlightGradientLocations count]];
+ for (int i = 0; i < [highlightGradientLocations count]; i++)
+ {
+ NSNumber *location = [highlightGradientLocations objectAtIndex:i];
+ locations[i] = [location floatValue];
+ }
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+
+ highlightGradient = CGGradientCreateWithColors(space, (CFArrayRef)highlightGradientColors, locations);
+ CGColorSpaceRelease(space);
+ }
+ return highlightGradient;
+}
+#pragma mark -
+- (id)initWithFrame:(CGRect)frame
+{
+ self = [super initWithFrame:frame];
+ if (self)
+ {
+ [self setOpaque:NO];
+ self.backgroundColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.0];
+ }
+ return self;
+}
+#pragma mark -
+#pragma mark Appearances
+- (void)useAlertStyle
+{
+
+ NSMutableArray *colors = [NSMutableArray arrayWithCapacity:3];
+ UIColor *color = [UIColor colorWithRed:0.283 green:0.32 blue:0.414 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.82 green:0.834 blue:0.87 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.186 green:0.223 blue:0.326 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ self.normalGradientColors = colors;
+ self.normalGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.483f],
+ nil];
+
+ NSMutableArray *colors2 = [NSMutableArray arrayWithCapacity:4];
+ color = [UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.656 green:0.683 blue:0.713 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.137 green:0.155 blue:0.208 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.237 green:0.257 blue:0.305 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ self.highlightGradientColors = colors2;
+ self.highlightGradientLocations = [NSArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.51f],
+ [NSNumber numberWithFloat:0.654f],
+ nil];
+ self.cornerRadius = 7.0f;
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
+
+}
+- (void)useRedDeleteStyle
+{
+ NSMutableArray *colors = [NSMutableArray arrayWithCapacity:5];
+ UIColor *color = [UIColor colorWithRed:0.667 green:0.15 blue:0.152 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.841 green:0.566 blue:0.566 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.75 green:0.341 blue:0.345 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.592 green:0.0 blue:0.0 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.592 green:0.0 blue:0.0 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ self.normalGradientColors = colors;
+ self.normalGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.582f],
+ [NSNumber numberWithFloat:0.418f],
+ [NSNumber numberWithFloat:0.346],
+ nil];
+
+ NSMutableArray *colors2 = [NSMutableArray arrayWithCapacity:5];
+ color = [UIColor colorWithRed:0.467 green:0.009 blue:0.005 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.754 green:0.562 blue:0.562 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.543 green:0.212 blue:0.212 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.5 green:0.153 blue:0.152 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.388 green:0.004 blue:0.0 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+
+ self.highlightGradientColors = colors;
+ self.highlightGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.715f],
+ [NSNumber numberWithFloat:0.513f],
+ [NSNumber numberWithFloat:0.445f],
+ nil];
+ self.cornerRadius = 9.f;
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+
+}
+- (void)useWhiteStyle
+{
+ NSMutableArray *colors = [NSMutableArray arrayWithCapacity:3];
+ UIColor *color = [UIColor colorWithRed:0.864 green:0.864 blue:0.864 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.995 green:0.995 blue:0.995 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.956 green:0.956 blue:0.955 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ self.normalGradientColors = colors;
+ self.normalGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.601f],
+ nil];
+
+ NSMutableArray *colors2 = [NSMutableArray arrayWithCapacity:3];
+ color = [UIColor colorWithRed:0.692 green:0.692 blue:0.691 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.995 green:0.995 blue:0.995 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.83 green:0.83 blue:0.83 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ self.highlightGradientColors = colors2;
+ self.highlightGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.601f],
+ nil];
+
+ self.cornerRadius = 9.f;
+ [self setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+ [self setTitleColor:[UIColor darkGrayColor] forState:UIControlStateHighlighted];
+}
+- (void)useBlackStyle
+{
+ NSMutableArray *colors = [NSMutableArray arrayWithCapacity:4];
+ UIColor *color = [UIColor colorWithRed:0.154 green:0.154 blue:0.154 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.307 green:0.307 blue:0.307 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];;
+ color = [UIColor colorWithRed:0.166 green:0.166 blue:0.166 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.118 green:0.118 blue:0.118 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ self.normalGradientColors = colors;
+ self.normalGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.548f],
+ [NSNumber numberWithFloat:0.462f],
+ nil];
+ self.cornerRadius = 9.0f;
+
+ NSMutableArray *colors2 = [NSMutableArray arrayWithCapacity:4];
+ color = [UIColor colorWithRed:0.199 green:0.199 blue:0.199 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.04 green:0.04 blue:0.04 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.074 green:0.074 blue:0.074 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.112 green:0.112 blue:0.112 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+
+ self.highlightGradientColors = colors2;
+ self.highlightGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.548f],
+ [NSNumber numberWithFloat:0.462f],
+ nil];
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+}
+- (void)useSimpleOrangeStyle
+{
+ NSMutableArray *colors = [NSMutableArray arrayWithCapacity:2];
+ UIColor *color = [UIColor colorWithRed:0.935 green:0.403 blue:0.02 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.97 green:0.582 blue:0.0 alpha:1.0];
+ [colors addObject:(id)[color CGColor]];
+ self.normalGradientColors = colors;
+ self.normalGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ nil];
+
+ NSMutableArray *colors2 = [NSMutableArray arrayWithCapacity:3];
+ color = [UIColor colorWithRed:0.914 green:0.309 blue:0.0 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.935 green:0.4 blue:0.0 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ color = [UIColor colorWithRed:0.946 green:0.441 blue:0.01 alpha:1.0];
+ [colors2 addObject:(id)[color CGColor]];
+ self.highlightGradientColors = colors2;
+ self.highlightGradientLocations = [NSMutableArray arrayWithObjects:
+ [NSNumber numberWithFloat:0.0f],
+ [NSNumber numberWithFloat:1.0f],
+ [NSNumber numberWithFloat:0.498f],
+ nil];
+
+ self.cornerRadius = 9.f;
+ [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+}
+#pragma mark -
+- (void)drawRect:(CGRect)rect
+{
+ self.backgroundColor = [UIColor clearColor];
+ CGRect imageBounds = CGRectMake(0.0, 0.0, self.bounds.size.width - 0.5, self.bounds.size.height);
+ CGFloat alignStroke;
+ CGFloat resolution;
+ CGFloat stroke;
+ CGMutablePathRef path;
+ CGPoint point;
+ CGPoint controlPoint1;
+ CGPoint controlPoint2;
+ CGGradientRef gradient;
+ UIColor *color;
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+ CGContextRef context = UIGraphicsGetCurrentContext();
+ CGPoint point2;
+
+ resolution = 0.5 * (self.bounds.size.width / imageBounds.size.width + self.bounds.size.height / imageBounds.size.height);
+
+ stroke = 1.0;
+ stroke *= resolution;
+ if (stroke < 1.0)
+ stroke = ceil(stroke);
+ else
+ stroke = round(stroke);
+ stroke /= resolution;
+ alignStroke = fmod(0.5 * stroke * resolution, 1.0);
+ path = CGPathCreateMutable();
+ point = CGPointMake((self.bounds.size.width - [self cornerRadius]), self.bounds.size.height - 0.5f);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ CGPathMoveToPoint(path, NULL, point.x, point.y);
+ point = CGPointMake(self.bounds.size.width - 0.5f, (self.bounds.size.height - [self cornerRadius]));
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ controlPoint1 = CGPointMake((self.bounds.size.width - ([self cornerRadius] / 2.f)), self.bounds.size.height - 0.5f);
+ controlPoint1.x = (round(resolution * controlPoint1.x + alignStroke) - alignStroke) / resolution;
+ controlPoint1.y = (round(resolution * controlPoint1.y + alignStroke) - alignStroke) / resolution;
+ controlPoint2 = CGPointMake(self.bounds.size.width - 0.5f, (self.bounds.size.height - ([self cornerRadius] / 2.f)));
+ controlPoint2.x = (round(resolution * controlPoint2.x + alignStroke) - alignStroke) / resolution;
+ controlPoint2.y = (round(resolution * controlPoint2.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddCurveToPoint(path, NULL, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, point.x, point.y);
+ point = CGPointMake(self.bounds.size.width - 0.5f, [self cornerRadius]);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddLineToPoint(path, NULL, point.x, point.y);
+ point = CGPointMake((self.bounds.size.width - [self cornerRadius]), 0.0);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ controlPoint1 = CGPointMake(self.bounds.size.width - 0.5f, ([self cornerRadius] / 2.f));
+ controlPoint1.x = (round(resolution * controlPoint1.x + alignStroke) - alignStroke) / resolution;
+ controlPoint1.y = (round(resolution * controlPoint1.y + alignStroke) - alignStroke) / resolution;
+ controlPoint2 = CGPointMake((self.bounds.size.width - ([self cornerRadius] / 2.f)), 0.0);
+ controlPoint2.x = (round(resolution * controlPoint2.x + alignStroke) - alignStroke) / resolution;
+ controlPoint2.y = (round(resolution * controlPoint2.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddCurveToPoint(path, NULL, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, point.x, point.y);
+ point = CGPointMake([self cornerRadius], 0.0);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddLineToPoint(path, NULL, point.x, point.y);
+ point = CGPointMake(0.0, [self cornerRadius]);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ controlPoint1 = CGPointMake(([self cornerRadius] / 2.f), 0.0);
+ controlPoint1.x = (round(resolution * controlPoint1.x + alignStroke) - alignStroke) / resolution;
+ controlPoint1.y = (round(resolution * controlPoint1.y + alignStroke) - alignStroke) / resolution;
+ controlPoint2 = CGPointMake(0.0, ([self cornerRadius] / 2.f));
+ controlPoint2.x = (round(resolution * controlPoint2.x + alignStroke) - alignStroke) / resolution;
+ controlPoint2.y = (round(resolution * controlPoint2.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddCurveToPoint(path, NULL, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, point.x, point.y);
+ point = CGPointMake(0.0, (self.bounds.size.height - [self cornerRadius]));
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddLineToPoint(path, NULL, point.x, point.y);
+ point = CGPointMake([self cornerRadius], self.bounds.size.height - 0.5f);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ controlPoint1 = CGPointMake(0.0, (self.bounds.size.height - ([self cornerRadius] / 2.f)));
+ controlPoint1.x = (round(resolution * controlPoint1.x + alignStroke) - alignStroke) / resolution;
+ controlPoint1.y = (round(resolution * controlPoint1.y + alignStroke) - alignStroke) / resolution;
+ controlPoint2 = CGPointMake(([self cornerRadius] / 2.f), self.bounds.size.height - 0.5f);
+ controlPoint2.x = (round(resolution * controlPoint2.x + alignStroke) - alignStroke) / resolution;
+ controlPoint2.y = (round(resolution * controlPoint2.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddCurveToPoint(path, NULL, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, point.x, point.y);
+ point = CGPointMake((self.bounds.size.width - [self cornerRadius]), self.bounds.size.height - 0.5f);
+ point.x = (round(resolution * point.x + alignStroke) - alignStroke) / resolution;
+ point.y = (round(resolution * point.y + alignStroke) - alignStroke) / resolution;
+ CGPathAddLineToPoint(path, NULL, point.x, point.y);
+ CGPathCloseSubpath(path);
+ if (self.state == UIControlStateHighlighted)
+ gradient = self.highlightGradient;
+ else
+ gradient = self.normalGradient;
+
+ CGContextAddPath(context, path);
+ CGContextSaveGState(context);
+ CGContextEOClip(context);
+ point = CGPointMake((self.bounds.size.width / 2.0), self.bounds.size.height - 0.5f);
+ point2 = CGPointMake((self.bounds.size.width / 2.0), 0.0);
+ CGContextDrawLinearGradient(context, gradient, point, point2, (kCGGradientDrawsBeforeStartLocation | kCGGradientDrawsAfterEndLocation));
+ CGContextRestoreGState(context);
+ color = [UIColor colorWithRed:0.076 green:0.103 blue:0.195 alpha:1.0];
+ [color setStroke];
+ CGContextSetLineWidth(context, stroke);
+ CGContextSetLineCap(context, kCGLineCapSquare);
+ CGContextAddPath(context, path);
+ CGContextStrokePath(context);
+ CGPathRelease(path);
+
+ CGColorSpaceRelease(space);
+}
+#pragma mark -
+#pragma mark Touch Handling
+- (void)hesitateUpdate
+{
+ [self setNeedsDisplay];
+}
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+ [super touchesBegan:touches withEvent:event];
+ [self setNeedsDisplay];
+}
+- (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event
+{
+ [super touchesCancelled:touches withEvent:event];
+ [self setNeedsDisplay];
+ [self performSelector:@selector(hesitateUpdate) withObject:nil afterDelay:0.1];
+}
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+ [super touchesMoved:touches withEvent:event];
+ [self setNeedsDisplay];
+
+}
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+ [super touchesEnded:touches withEvent:event];
+ [self setNeedsDisplay];
+ [self performSelector:@selector(hesitateUpdate) withObject:nil afterDelay:0.1];
+}
+#pragma mark -
+#pragma mark NSCoding
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+ [super encodeWithCoder:encoder];
+ [encoder encodeObject:[self normalGradientColors] forKey:@"normalGradientColors"];
+ [encoder encodeObject:[self normalGradientLocations] forKey:@"normalGradientLocations"];
+ [encoder encodeObject:[self highlightGradientColors] forKey:@"highlightGradientColors"];
+ [encoder encodeObject:[self highlightGradientLocations] forKey:@"highlightGradientLocations"];
+}
+
+- (id)initWithCoder:(NSCoder *)decoder
+{
+ if (self = [super initWithCoder:decoder])
+ {
+ [self setNormalGradientColors:[decoder decodeObjectForKey:@"normalGradientColors"]];
+ [self setNormalGradientLocations:[decoder decodeObjectForKey:@"normalGradientLocations"]];
+ [self setHighlightGradientColors:[decoder decodeObjectForKey:@"highlightGradientColors"]];
+ [self setHighlightGradientLocations:[decoder decodeObjectForKey:@"highlightGradientLocations"]];
+
+ if (self.normalGradientColors == nil)
+ [self useWhiteStyle];
+
+ [self setOpaque:NO];
+ self.backgroundColor = [UIColor colorWithRed:1.0 green:1.0 blue:1.0 alpha:0.0];
+ }
+ return self;
+}
+#pragma mark -
+- (void)dealloc
+{
+ [normalGradientColors release];
+ [normalGradientLocations release];
+ [highlightGradientColors release];
+ [highlightGradientLocations release];
+
+ if (normalGradient != NULL)
+ CGGradientRelease(normalGradient);
+ if (highlightGradient != NULL)
+ CGGradientRelease(highlightGradient);
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsPotiValueController.xib
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsPotiValueController.xib (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsPotiValueController.xib (revision 805)
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10D573</string>
+ <string key="IBDocument.InterfaceBuilderVersion">783</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">460.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">107</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIPickerView" id="175389793">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">290</int>
+ <string key="NSFrame">{{0, 88}, {320, 216}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <float key="IBUIAlpha">0.0</float>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIShowsSelectionIndicator">YES</bool>
+ </object>
+ <object class="IBUITextField" id="164640674">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 88}, {280, 31}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <string key="IBUIText"/>
+ <int key="IBUIBorderStyle">3</int>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIKeyboardType">4</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBUISwitch" id="1007142614">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{206, 20}, {94, 27}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentHorizontalAlignment">0</int>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ </object>
+ <object class="IBUILabel" id="805205008">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 22}, {73, 22}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Use Poti</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">Helvetica-Bold</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 372}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC43MDE5NjA4MDIxIDAuNzAxOTYwODAyMSAwLjcwMTk2MDgwMjEAA</bytes>
+ </object>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+ <bool key="IBUIPrompted">NO</bool>
+ </object>
+ <object class="IBUISimulatedToolbarMetrics" key="IBUISimulatedBottomBarMetrics"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">sliderLabel</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="805205008"/>
+ </object>
+ <int key="connectionID">8</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">numberField</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="164640674"/>
+ </object>
+ <int key="connectionID">9</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">potiSwitch</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="1007142614"/>
+ </object>
+ <int key="connectionID">10</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">potiPicker</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="175389793"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="175389793"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">12</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="175389793"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">backgroundTap:</string>
+ <reference key="source" ref="191373211"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">7</int>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">textFieldDoneEditing:</string>
+ <reference key="source" ref="164640674"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">19</int>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">toggleControls:</string>
+ <reference key="source" ref="1007142614"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="164640674"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1007142614"/>
+ <reference ref="805205008"/>
+ <reference ref="164640674"/>
+ <reference ref="175389793"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="175389793"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="164640674"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="1007142614"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="805205008"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>InAppSettingsPotiValueController</string>
+ <string>UIResponder</string>
+ <string>UIControl</string>
+ <string>{{673, 278}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">18</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">InAppSettingsPotiValueController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backgroundTap:</string>
+ <string>textFieldDoneEditing:</string>
+ <string>toggleControls:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>backgroundTap:</string>
+ <string>textFieldDoneEditing:</string>
+ <string>toggleControls:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">backgroundTap:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">textFieldDoneEditing:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">toggleControls:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>numberField</string>
+ <string>potiPicker</string>
+ <string>potiSwitch</string>
+ <string>sliderLabel</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UITextField</string>
+ <string>UIPickerView</string>
+ <string>UISwitch</string>
+ <string>UILabel</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>numberField</string>
+ <string>potiPicker</string>
+ <string>potiSwitch</string>
+ <string>sliderLabel</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">numberField</string>
+ <string key="candidateClassName">UITextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">potiPicker</string>
+ <string key="candidateClassName">UIPickerView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">potiSwitch</string>
+ <string key="candidateClassName">UISwitch</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">sliderLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">InAppSettingsPotiValueController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../MKCommunication/AsyncSocket.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="938759004">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIPickerView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPickerView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="938759004"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISwitch</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISwitch.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITextField</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="360062614">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <reference key="sourceIdentifier" ref="360062614"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">MK4PhoneNav.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">107</string>
+ </data>
+</archive>
Index: trunk/Classes/InAppSettings/InAppSettingsReader.m
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsReader.m (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsReader.m (revision 805)
@@ -0,0 +1,128 @@
+//
+// InAppSettingsReader.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 1/19/10.
+// Copyright 2010 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsReader.h"
+#import "InAppSettingsSpecifier.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsReaderRegisterDefaults
+
+@synthesize files;
+@synthesize values;
+
+- (void) loadFile:(NSString *)file {
+ // if the file is not in the files list we havn't read it yet
+ NSInteger fileIndex = [self.files indexOfObject:file];
+
+ if (fileIndex == NSNotFound) {
+ [self.files addObject:file];
+
+ // load plist
+ NSDictionary * settingsDictionary = [[NSDictionary alloc] initWithContentsOfFile:InAppSettingsFullPlistPath(file)];
+ NSArray * preferenceSpecifiers = [settingsDictionary objectForKey:InAppSettingsPreferenceSpecifiers];
+ NSString * stringsTable = [settingsDictionary objectForKey:InAppSettingsStringsTable];
+
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+ for (NSDictionary * eachSetting in preferenceSpecifiers) {
+ InAppSettingsSpecifier * setting = [[InAppSettingsSpecifier alloc] initWithDictionary:eachSetting andStringsTable:stringsTable];
+ if ([setting isValid]) {
+ if ([setting isType:InAppSettingsPSChildPaneSpecifier]) {
+ [self loadFile:[setting valueForKey:InAppSettingsSpecifierFile]];
+ } else if ([setting hasKey]) {
+ if ([setting valueForKey:InAppSettingsSpecifierDefaultValue]) {
+ [self.values
+ setObject:[setting valueForKey:InAppSettingsSpecifierDefaultValue]
+ forKey:[setting getKey]];
+ }
+ }
+ }
+ [setting release];
+ }
+ [pool drain];
+ [settingsDictionary release];
+ }
+}
+
+- (id) init {
+ self = [super init];
+ if (self != nil) {
+ self.files = [[NSMutableArray alloc] init];
+ self.values = [[NSMutableDictionary alloc] init];
+ [self loadFile:InAppSettingsRootFile];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:self.values];
+ }
+ return self;
+}
+
+
+- (void) dealloc {
+ [files release];
+ [values release];
+ [super dealloc];
+}
+
+@end
+
+@implementation InAppSettingsReader
+
+@synthesize file;
+@synthesize headers, settings;
+
+- (id) initWithFile:(NSString *)inputFile {
+ self = [super init];
+ if (self != nil) {
+ self.file = inputFile;
+
+ // load plist
+ NSDictionary * settingsDictionary = [[NSDictionary alloc] initWithContentsOfFile:InAppSettingsFullPlistPath(self.file)];
+ NSArray * preferenceSpecifiers = [settingsDictionary objectForKey:InAppSettingsPreferenceSpecifiers];
+ NSString * stringsTable = [settingsDictionary objectForKey:InAppSettingsStringsTable];
+
+ // initialize the arrays
+ headers = [[NSMutableArray alloc] init];
+ settings = [[NSMutableArray alloc] init];
+
+ // load the data
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+ for (NSDictionary * eachSetting in preferenceSpecifiers) {
+ InAppSettingsSpecifier * setting = [[InAppSettingsSpecifier alloc] initWithDictionary:eachSetting andStringsTable:stringsTable];
+ setting.dataSource = dataSource;
+ if ([setting isValid]) {
+ if ([setting isType:InAppSettingsPSGroupSpecifier]) {
+ [self.headers addObject:[setting localizedTitle]];
+ [self.settings addObject:[NSMutableArray array]];
+ } else {
+ // if there are no settings make an initial container
+ if ([self.settings count] < 1) {
+ [self.headers addObject:@""];
+ [self.settings addObject:[NSMutableArray array]];
+ }
+ [[self.settings lastObject] addObject:setting];
+ }
+ }
+ [setting release];
+ }
+ [pool drain];
+ [settingsDictionary release];
+ }
+ return self;
+}
+
+- (id) initWithFile:(NSString *)inputFile dataSource:(id<InAppSettingsDatasource>)aDataSource {
+ dataSource = aDataSource;
+ return [self initWithFile:inputFile];
+}
+
+- (void) dealloc {
+ [file release];
+ [headers release];
+ [settings release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsSpecifier.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsSpecifier.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsSpecifier.h (revision 805)
@@ -0,0 +1,47 @@
+//
+// InAppSetting.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol InAppSettingsSpecifierDelegate;
+@protocol InAppSettingsDatasource;
+
+@interface InAppSettingsSpecifier : NSObject {
+ NSString * stringsTable;
+ NSDictionary * settingDictionary;
+ id<InAppSettingsSpecifierDelegate> delegate;
+ id<InAppSettingsDatasource> dataSource;
+}
+
+@property (nonatomic, copy) NSString * stringsTable;
+@property (assign) id<InAppSettingsSpecifierDelegate> delegate;
+@property (assign) id<InAppSettingsDatasource> dataSource;
+
+- (NSString *) getKey;
+- (NSString *) getType;
+- (BOOL) isType:(NSString *)type;
+- (id) getValue;
+- (void) setValue:(id)newValue;
+- (id) valueForKey:(NSString *)key;
+- (NSString *) localizedTitle;
+- (NSString *) cellName;
+
+- (BOOL) hasTitle;
+- (BOOL) hasKey;
+- (BOOL) hasDefaultValue;
+- (BOOL) isValid;
+
+- (id) initWithDictionary:(NSDictionary *)dictionary andStringsTable:(NSString *)table;
+
+@end
+
+@protocol InAppSettingsSpecifierDelegate < NSObject >
+
+- (void) settingsSpecifierUpdated:(InAppSettingsSpecifier *)specifier;
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsConstants.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsConstants.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsConstants.h (revision 805)
@@ -0,0 +1,76 @@
+//
+// InAppSettingsConstants.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <Availability.h>
+
+#define InAppSettingsRootFile @"Root"
+#define InAppSettingsProjectName @"InAppSettings"
+
+#define InAppSettingsOffsetY 2.0f
+#define InAppSettingsFontSize 17.0f
+#define InAppSettingsCellPadding 9.0f
+#define InAppSettingsTablePadding 10.0f
+#define InAppSettingsPowerFooterHeight 32.0f
+#define InAppSettingsLightingBoltSize 16.0f
+#define InAppSettingsKeyboardAnimation 0.3f
+#define InAppSettingsCellTextFieldMinX 115.0f
+#define InAppSettingsCellToggleSwitchWidth 94.0f
+#define InAppSettingsCellDisclosureIndicatorWidth 10.0f
+#define InAppSettingsTotalCellPadding InAppSettingsCellPadding * 2
+#define InAppSettingsTotalTablePadding InAppSettingsTablePadding * 2
+#define InAppSettingsScreenWidth 320
+#define InAppSettingsScreenHeight 480
+#define InAppSettingsCellTitleMaxWidth InAppSettingsScreenWidth - (InAppSettingsTotalTablePadding + InAppSettingsTotalCellPadding)
+#define InAppSettingsFooterFont [UIFont systemFontOfSize:14.0f]
+#define InAppSettingsBoldFont [UIFont boldSystemFontOfSize:InAppSettingsFontSize]
+#define InAppSettingsNormalFont [UIFont systemFontOfSize:InAppSettingsFontSize]
+#define InAppSettingsBlue [UIColor colorWithRed:0.22f green:0.33f blue:0.53f alpha:1.0f];
+#define InAppSettingsFooterBlue [UIColor colorWithRed:0.36f green:0.39f blue:0.45f alpha:1.0f]
+
+#define InAppSettingsOpenUrl(url) [[UIApplication sharedApplication] openURL : url];
+#define InAppSettingsBundlePath [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"]
+#define InAppSettingsFullPlistPath(file) \
+ [InAppSettingsBundlePath stringByAppendingPathComponent :[file stringByAppendingPathExtension:@"plist"]]
+#define InAppSettingsLocalize(stringKey, tableKey) \
+ [[NSBundle bundleWithPath:InAppSettingsBundlePath] localizedStringForKey : stringKey value : stringKey table : tableKey]
+
+// settings strings
+#define InAppSettingsStringsTable @"StringsTable"
+#define InAppSettingsPreferenceSpecifiers @"PreferenceSpecifiers"
+
+#define InAppSettingsPSGroupSpecifier @"PSGroupSpecifier"
+#define InAppSettingsPSSliderSpecifier @"PSSliderSpecifier"
+#define InAppSettingsPSChildPaneSpecifier @"PSChildPaneSpecifier"
+#define InAppSettingsPSTextFieldSpecifier @"PSTextFieldSpecifier"
+#define InAppSettingsPSTitleValueSpecifier @"PSTitleValueSpecifier"
+#define InAppSettingsPSMultiValueSpecifier @"PSMultiValueSpecifier"
+#define InAppSettingsPSToggleSwitchSpecifier @"PSToggleSwitchSpecifier"
+
+#define InAppSettingsSpecifierKey @"Key"
+#define InAppSettingsSpecifierType @"Type"
+#define InAppSettingsSpecifierFile @"File"
+#define InAppSettingsSpecifierTitle @"Title"
+#define InAppSettingsSpecifierTitles @"Titles"
+#define InAppSettingsSpecifierValues @"Values"
+#define InAppSettingsSpecifierDefaultValue @"DefaultValue"
+#define InAppSettingsSpecifierMinimumValue @"MinimumValue"
+#define InAppSettingsSpecifierMaximumValue @"MaximumValue"
+#define InAppSettingsSpecifierInAppURL @"InAppURL"
+#define InAppSettingsSpecifierInAppTitle @"InAppTitle"
+
+#define InAppSettingsSpecifierInAppNumtype @"InAppNumtype"
+
+#define InAppSettingsSpecifierInAppChildPaneClass @"InAppChildPaneClass"
+#define InAppSettingsSpecifierInAppCellClass @"InAppCellClass"
+
+
+// test what cell init code should be used
+#define InAppSettingsUseNewCells __IPHONE_3_0 && __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0
+
+// if you dont want to display the footer set this to NO
+#define InAppSettingsDisplayPowered YES
Index: trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.h (revision 805)
@@ -0,0 +1,22 @@
+//
+// PSMultiValueSpecifierTable.h
+// InAppSettings
+//
+// Created by David Keegan on 11/3/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsSpecifier.h"
+
+@interface InAppSettingsPSMultiValueSpecifierTable : UITableViewController {
+ InAppSettingsSpecifier * setting;
+}
+
+@property (nonatomic, retain) InAppSettingsSpecifier * setting;
+
+- (id) initWithSetting:(InAppSettingsSpecifier *)inputSetting;
+- (id) getValue;
+- (void) setValue:(id)newValue;
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsPotiValueController.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsPotiValueController.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsPotiValueController.h (revision 805)
@@ -0,0 +1,37 @@
+//
+// InAppSettingsPotiValueController.h
+// MK4PhoneNav
+//
+// Created by Frank Blumenberg on 05.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettings.h"
+
+
+@interface InAppSettingsPotiValueController : UIViewController<InAppSettingsChildPane, UITextFieldDelegate> {
+
+ InAppSettingsSpecifier* setting;
+
+ UITextField *numberField;
+ UILabel *sliderLabel;
+ UISwitch *potiSwitch;
+
+ UIPickerView *potiPicker;
+ NSArray *pickerData;
+}
+
+@property (nonatomic, retain) NSArray *pickerData;
+@property (nonatomic, retain) InAppSettingsSpecifier* setting;
+
+@property (nonatomic, retain) IBOutlet UIPickerView *potiPicker;
+@property (nonatomic, retain) IBOutlet UITextField *numberField;
+@property (nonatomic, retain) IBOutlet UILabel *sliderLabel;
+@property (nonatomic, retain) IBOutlet UISwitch *potiSwitch;
+
+- (IBAction)textFieldDoneEditing:(id)sender;
+- (IBAction)backgroundTap:(id)sender;
+- (IBAction)toggleControls:(id)sender;
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsSpecifier.m
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsSpecifier.m (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsSpecifier.m (revision 805)
@@ -0,0 +1,235 @@
+//
+// InAppSetting.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettings.h"
+#import "InAppSettingsSpecifier.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsSpecifier
+
+@synthesize stringsTable;
+@synthesize delegate;
+@synthesize dataSource;
+
+- (NSString *) getKey {
+ return [self valueForKey:InAppSettingsSpecifierKey];
+}
+
+- (NSString *) getType {
+ return [self valueForKey:InAppSettingsSpecifierType];
+}
+
+- (BOOL) isType:(NSString *)type {
+ return [[self getType] isEqualToString:type];
+}
+
+- (id) valueForKey:(NSString *)key {
+ return [settingDictionary objectForKey:key];
+}
+
+- (NSString *) localizedTitle {
+ NSString * title = [self valueForKey:InAppSettingsSpecifierTitle];
+
+ if ([self valueForKey:InAppSettingsSpecifierInAppTitle]) {
+ title = [self valueForKey:InAppSettingsSpecifierInAppTitle];
+ }
+ return InAppSettingsLocalize(title, self.stringsTable);
+}
+
+- (NSString *) cellName {
+
+ if ([self valueForKey:InAppSettingsSpecifierInAppCellClass]) {
+ return [self valueForKey:InAppSettingsSpecifierInAppCellClass];
+ }
+
+ return [NSString stringWithFormat:@"%@%@Cell", InAppSettingsProjectName, [self getType]];
+}
+
+- (id) getValue {
+
+ id value;
+
+ if ( self.dataSource != nil )
+ value = [self.dataSource objectForKey:[self getKey]];
+ else
+ value = [[NSUserDefaults standardUserDefaults] valueForKey:[self getKey]];
+
+ if (value == nil) {
+ value = [self valueForKey:InAppSettingsSpecifierDefaultValue];
+ }
+ return value;
+}
+
+- (void) setValue:(id)newValue {
+ NSString * key = [self getKey];
+
+ if ( self.dataSource != nil ) {
+ [self.dataSource setObject:newValue forKey:key];
+ } else
+ [[NSUserDefaults standardUserDefaults] setObject:newValue forKey:key];
+
+ [self.delegate settingsSpecifierUpdated:self];
+}
+
+#pragma mark validation
+
+- (BOOL) hasTitle {
+ return ([self valueForKey:InAppSettingsSpecifierTitle]) ? YES : NO;
+}
+
+- (BOOL) hasKey {
+ NSString * key = [self getKey];
+
+ return (key && (![key isEqualToString:@""]));
+}
+
+- (BOOL) hasDefaultValue {
+ return ([self valueForKey:InAppSettingsSpecifierDefaultValue]) ? YES : NO;
+}
+
+- (BOOL) isValid {
+ if (![self getType]) {
+ return NO;
+ }
+
+ if ([self isType:InAppSettingsPSGroupSpecifier]) {
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSMultiValueSpecifier]) {
+ if (![self hasKey]) {
+ return NO;
+ }
+
+ if (![self hasDefaultValue]) {
+ return NO;
+ }
+
+ // check the localized and un-locatlized values
+ if (![self hasTitle] || [[self valueForKey:InAppSettingsSpecifierTitle] length] == 0) {
+ return NO;
+ }
+
+ NSArray * titles = [self valueForKey:InAppSettingsSpecifierTitles];
+ if ((!titles) || ([titles count] == 0)) {
+ return NO;
+ }
+
+ NSArray * values = [self valueForKey:InAppSettingsSpecifierValues];
+ if ((!values) || ([values count] == 0)) {
+ return NO;
+ }
+
+ if ([titles count] != [values count]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSSliderSpecifier]) {
+ if (![self hasKey]) {
+ return NO;
+ }
+
+ if (![self hasDefaultValue]) {
+ return NO;
+ }
+
+ // The settings app allows min>max
+ if (![self valueForKey:InAppSettingsSpecifierMinimumValue]) {
+ return NO;
+ }
+
+ if (![self valueForKey:InAppSettingsSpecifierMaximumValue]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSToggleSwitchSpecifier]) {
+ if (![self hasKey]) {
+ return NO;
+ }
+
+ if (![self hasDefaultValue]) {
+ return NO;
+ }
+
+ if (![self hasTitle]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSTitleValueSpecifier]) {
+ if (![self hasKey]) {
+ return NO;
+ }
+
+ if (![self hasDefaultValue]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSTextFieldSpecifier]) {
+ if (![self hasKey]) {
+ return NO;
+ }
+
+ if (![self hasTitle]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ if ([self isType:InAppSettingsPSChildPaneSpecifier]) {
+ if (![self hasTitle]) {
+ return NO;
+ }
+
+ if (![self valueForKey:InAppSettingsSpecifierFile]) {
+ return NO;
+ }
+
+ return YES;
+ }
+
+ return NO;
+}
+
+#pragma mark init/dealloc
+
+- (id) init {
+ return [self initWithDictionary:nil andStringsTable:nil];
+}
+
+- (id) initWithDictionary:(NSDictionary *)dictionary andStringsTable:(NSString *)table {
+ self = [super init];
+ if (self != nil) {
+ if (dictionary) {
+ self.stringsTable = table;
+ settingDictionary = [dictionary retain];
+ }
+ }
+ return self;
+}
+
+- (void) dealloc {
+ self.delegate = nil;
+ [stringsTable release];
+ [settingDictionary release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettings.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettings.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettings.h (revision 805)
@@ -0,0 +1,83 @@
+//
+// InAppSettingsViewController.h
+// InAppSettings
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+#import "InAppSettingsReader.h"
+#import "InAppSettingsSpecifier.h"
+
+@protocol InAppSettingsDelegate;
+
+@protocol InAppSettingsDatasource < NSObject >
+- (id) objectForKey:(id)aKey;
+- (void) setObject:(id)anObject forKey:(id)aKey;
+@end
+
+@interface InAppSettings : NSObject {}
+
++ (void) registerDefaults;
+
+@end
+
+@interface InAppSettingsModalViewController : UIViewController {}
+
+@end
+
+@interface InAppSettingsViewController : UIViewController <UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, InAppSettingsSpecifierDelegate> {
+ NSString * file;
+ UITableView * settingsTableView;
+ UIControl * firstResponder;
+ InAppSettingsReader * settingsReader;
+ id<InAppSettingsDelegate> delegate;
+ id<InAppSettingsDatasource> dataSource;
+}
+
+@property (nonatomic, copy) NSString * file;
+@property (nonatomic, retain) UITableView * settingsTableView;
+@property (nonatomic, assign) UIControl * firstResponder;
+@property (nonatomic, retain) InAppSettingsReader * settingsReader;
+@property (assign) id<InAppSettingsDelegate> delegate;
+@property (assign) id<InAppSettingsDatasource> dataSource;
+
+- (id) initWithFile:(NSString *)inputFile;
+
+// modal view
+- (void) dismissModalView;
+- (void) addDoneButton;
+
+// keyboard notification
+- (void) registerForKeyboardNotifications;
+- (void) keyboardWillShow:(NSNotification *)notification;
+- (void) keyboardWillHide:(NSNotification *)notification;
+
+@end
+
+@interface InAppSettingsLightningBolt : UIView {
+ BOOL flip;
+}
+
+@property (nonatomic, assign) BOOL flip;
+
+@end
+
+@protocol InAppSettingsDelegate < NSObject >
+
+@optional
+- (void) InAppSettingsValue:(id)value forKey:(NSString *)key;
+
+@end
+
+@protocol InAppSettingsChildPane < NSObject >
+
+@property (nonatomic, retain) InAppSettingsSpecifier * setting;
+
+- (id) initWithSetting:(InAppSettingsSpecifier *)inputSetting;
+- (id) getValue;
+- (void) setValue:(id)newValue;
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.m
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.m (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsPSMultiValueSpecifierTable.m (revision 805)
@@ -0,0 +1,126 @@
+//
+// PSMultiValueSpecifierTable.m
+// InAppSettings
+//
+// Created by David Keegan on 11/3/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettings.h"
+#import "InAppSettingsPSMultiValueSpecifierTable.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSMultiValueSpecifierTable
+
+@synthesize setting;
+
+- (id) initWithStyle:(UITableViewStyle)style {
+ return [super initWithStyle:UITableViewStyleGrouped];
+}
+
+- (id) initWithSetting:(InAppSettingsSpecifier *)inputSetting {
+ self = [super init];
+ if (self != nil) {
+ self.setting = inputSetting;
+ }
+ return self;
+}
+
+- (void) viewDidLoad {
+ [super viewDidLoad];
+
+ self.title = [self.setting localizedTitle];
+}
+
+- (void) dealloc {
+ [setting release];
+ [super dealloc];
+}
+
+#pragma mark Value
+
+- (id) getValue {
+
+ id value;
+
+ if ( self.setting.dataSource != nil )
+ value = [self.setting.dataSource objectForKey:[self.setting getKey]];
+ else
+ value = [[NSUserDefaults standardUserDefaults] valueForKey:[self.setting getKey]];
+
+ if (value == nil) {
+ value = [self.setting valueForKey:InAppSettingsSpecifierDefaultValue];
+ }
+ return value;
+}
+
+- (void) setValue:(id)newValue {
+ if ( self.setting.dataSource != nil )
+ [self.setting.dataSource setObject:newValue forKey:[self.setting getKey]];
+ else
+ [[NSUserDefaults standardUserDefaults] setObject:newValue forKey:[self.setting getKey]];
+}
+
+#pragma mark Table view methods
+
+- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ return 1;
+}
+
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [[self.setting valueForKey:InAppSettingsSpecifierValues] count];
+}
+
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString * CellIdentifier = @"PSMultiValueSpecifierTableCell";
+
+ UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+
+ if (cell == nil) {
+ #if InAppSettingsUseNewCells
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+ #else
+ cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease];
+ #endif
+ }
+
+ NSString * cellTitle = InAppSettingsLocalize([[self.setting valueForKey:InAppSettingsSpecifierTitles] objectAtIndex:indexPath.row], self.setting.stringsTable);
+ id cellValue = [[self.setting valueForKey:InAppSettingsSpecifierValues] objectAtIndex:indexPath.row];
+ #if InAppSettingsUseNewCells
+ cell.textLabel.text = cellTitle;
+ #else
+ cell.text = cellTitle;
+ #endif
+ if ([cellValue isEqual:[self getValue]]) {
+ cell.accessoryType = UITableViewCellAccessoryCheckmark;
+ #if InAppSettingsUseNewCells
+ cell.textLabel.textColor = InAppSettingsBlue;
+ #else
+ cell.textColor = InAppSettingsBlue;
+ #endif
+ } else {
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ #if InAppSettingsUseNewCells
+ cell.textLabel.textColor = [UIColor blackColor];
+ #else
+ cell.textColor = [UIColor blackColor];
+ #endif
+ }
+
+ return cell;
+}
+
+- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ [tableView deselectRowAtIndexPath:[tableView indexPathForSelectedRow] animated:YES];
+}
+
+- (NSIndexPath *) tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ id cellValue = [[self.setting valueForKey:InAppSettingsSpecifierValues] objectAtIndex:indexPath.row];
+
+ [self setValue:cellValue];
+ [self.tableView reloadData];
+ return indexPath;
+}
+
+@end
+
Index: trunk/Classes/InAppSettings/InAppSettingsPotiValueController.m
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsPotiValueController.m (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsPotiValueController.m (revision 805)
@@ -0,0 +1,166 @@
+//
+// InAppSettingsPotiValueController.m
+// MK4PhoneNav
+//
+// Created by Frank Blumenberg on 05.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "InAppSettingsPotiValueController.h"
+
+
+@implementation InAppSettingsPotiValueController
+
+@synthesize setting;
+@synthesize numberField;
+@synthesize sliderLabel;
+@synthesize potiSwitch;
+@synthesize pickerData;
+@synthesize potiPicker;
+
+- (id) initWithSetting:(InAppSettingsSpecifier *)inputSetting {
+
+ if ((self = [super initWithNibName:@"InAppSettingsPotiValueController" bundle:nil])) {
+ self.setting=inputSetting;
+
+ NSArray *array = [[NSArray alloc] initWithObjects:
+ @"Poti1",
+ @"Poti2",
+ @"Poti3",
+ @"Poti4",
+ @"Poti5",
+ @"Poti6",
+ @"Poti7",
+ @"Poti8",
+ nil];
+ self.pickerData = array;
+ [array release];
+
+ }
+ return self;
+}
+
+
+- (void) viewDidLoad {
+ [super viewDidLoad];
+
+ self.title = [self.setting localizedTitle];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+
+ int value = [[setting getValue] intValue];
+ if (value<248) {
+ potiSwitch.on = NO;
+ numberField.alpha = 1.0f;
+ potiPicker.alpha = 0.0f;
+ numberField.text =[NSString stringWithFormat:@"%d",value];
+ }
+ else {
+ potiSwitch.on = YES;
+ numberField.alpha = 0.0f;
+ potiPicker.alpha = 1.0f;
+ numberField.text =@"0";
+ [potiPicker selectRow:255-value inComponent:0 animated:NO];
+ }
+}
+
+-(void) viewWillDisappear:(BOOL)animated
+{
+ int value=0;
+ if(potiSwitch.on)
+ {
+ int row = [potiPicker selectedRowInComponent:0];
+ value = 255-row;
+ }
+ else
+ {
+ value = [numberField.text intValue];
+ }
+
+ [setting setValue:[NSNumber numberWithInt:value]];
+}
+
+- (void) dealloc {
+ [setting release];
+ [numberField release];
+ [sliderLabel release];
+ [potiSwitch release];
+ [pickerData release];
+ [potiPicker release];
+ [super dealloc];
+}
+
+- (id) getValue {
+ return nil;
+}
+
+- (void) setValue:(id)newValue {
+
+}
+
+- (IBAction)textFieldDoneEditing:(id)sender {
+ [sender resignFirstResponder];
+}
+
+- (IBAction)backgroundTap:(id)sender {
+ [numberField resignFirstResponder];
+
+}
+
+- (IBAction)toggleControls:(id)sender {
+
+ [UIView beginAnimations:nil context:nil];
+ [UIView setAnimationDuration:0.3];
+ numberField.alpha = potiSwitch.on?0.0f:1.0f;
+ potiPicker.alpha = potiSwitch.on?1.0f:0.0f;
+ [UIView commitAnimations];
+}
+
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ self.numberField = nil;
+ self.sliderLabel = nil;
+ self.potiSwitch = nil;
+ self.pickerData = nil;
+ self.potiPicker = nil;
+ [super viewDidUnload];
+}
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+
+ NSMutableString* s = [textField.text mutableCopy];
+ [s replaceCharactersInRange:range withString:string];
+
+ int value = [s intValue];
+ [s release];
+ if (value <=245 ) {
+ return YES;
+ }
+ return NO;
+}
+
+#pragma mark -
+#pragma mark Picker Data Source Methods
+- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
+{
+ return 1;
+}
+- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
+{
+ return [pickerData count];
+}
+#pragma mark Picker Delegate Methods
+- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
+{
+ return [pickerData objectAtIndex:row];
+}
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettingsReader.h
===================================================================
--- trunk/Classes/InAppSettings/InAppSettingsReader.h (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettingsReader.h (revision 805)
@@ -0,0 +1,36 @@
+//
+// InAppSettingsReader.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 1/19/10.
+// Copyright 2010 InScopeApps{+}. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol InAppSettingsDatasource;
+
+@interface InAppSettingsReaderRegisterDefaults : NSObject {
+ // keep track of what files we've read to avoid circular references
+ NSMutableArray * files;
+ NSMutableDictionary * values;
+}
+
+@property (nonatomic, retain) NSMutableArray * files;
+@property (nonatomic, retain) NSMutableDictionary * values;
+
+@end
+
+@interface InAppSettingsReader : NSObject {
+ NSString * file;
+ NSMutableArray * headers, * settings;
+ id<InAppSettingsDatasource> dataSource;
+}
+
+@property (nonatomic, copy) NSString * file;
+@property (nonatomic, retain) NSMutableArray * headers, * settings;
+
+- (id) initWithFile:(NSString *)inputFile;
+- (id) initWithFile:(NSString *)inputFile dataSource:(id<InAppSettingsDatasource>)aDataSource;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.h (revision 805)
@@ -0,0 +1,16 @@
+//
+// PSTitleValueSpecifierCell.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSTitleValueSpecifierCell : InAppSettingsTableCell {}
+
+- (NSString *)getValueTitle;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.h (revision 805)
@@ -0,0 +1,20 @@
+//
+// PSToggleSwitchSpecifier.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSSliderSpecifierCell : InAppSettingsTableCell {
+ UISlider *valueSlider;
+}
+
+@property (nonatomic, retain) UISlider *valueSlider;
+
+- (void)slideAction;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSTitleValueSpecifierCell.m (revision 805)
@@ -0,0 +1,45 @@
+//
+// PSTitleValueSpecifierCell.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSTitleValueSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSTitleValueSpecifierCell
+
+- (NSString *)getValueTitle{
+ NSArray *titles = [self.setting valueForKey:InAppSettingsSpecifierTitles];
+ NSArray *values = [self.setting valueForKey:InAppSettingsSpecifierValues];
+ if(titles || values){
+ if(([titles count] == 0) || ([values count] == 0) || ([titles count] != [values count])){
+ return nil;
+ }
+ NSInteger valueIndex = [values indexOfObject:[self.setting getValue]];
+ if((valueIndex >= 0) && (valueIndex < (NSInteger)[titles count])){
+ return [titles objectAtIndex:valueIndex];
+ }
+
+ return nil;
+ }
+
+ return [self.setting getValue];
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+
+ if([self.setting valueForKey:InAppSettingsSpecifierInAppURL]){
+ [self setDisclosure:YES];
+ self.canSelectCell = YES;
+ }
+
+ [self setDetail:[self getValueTitle]];
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.h (revision 805)
@@ -0,0 +1,14 @@
+//
+// PSChildPaneSpecifierCell.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSChildPaneSpecifierCell : InAppSettingsTableCell {}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.h (revision 805)
@@ -0,0 +1,16 @@
+//
+// PSToggleSwitchSpecifier.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSMultiValueSpecifierCell : InAppSettingsTableCell {}
+
+- (NSString *)getValueTitle;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSSliderSpecifierCell.m (revision 805)
@@ -0,0 +1,55 @@
+//
+// PSToggleSwitchSpecifier.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSSliderSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSSliderSpecifierCell
+
+@synthesize valueSlider;
+
+- (void)slideAction{
+ [self.setting setValue:[NSNumber numberWithFloat:[self.valueSlider value]]];
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ //get the abolute path to the images
+ NSString *minImagePath = [InAppSettingsBundlePath stringByAppendingPathComponent:[self.setting valueForKey:@"MinimumValueImage"]];
+ NSString *maxImagePath = [InAppSettingsBundlePath stringByAppendingPathComponent:[self.setting valueForKey:@"MaximumValueImage"]];
+
+ //setup the slider
+ self.valueSlider.minimumValue = [[self.setting valueForKey:InAppSettingsSpecifierMinimumValue] floatValue];
+ self.valueSlider.maximumValue = [[self.setting valueForKey:InAppSettingsSpecifierMaximumValue] floatValue];
+ self.valueSlider.minimumValueImage = [UIImage imageWithContentsOfFile:minImagePath];
+ self.valueSlider.maximumValueImage = [UIImage imageWithContentsOfFile:maxImagePath];
+ CGRect valueSliderFrame = self.valueSlider.frame;
+ valueSliderFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(valueSliderFrame.size.height*0.5f));
+ valueSliderFrame.origin.x = InAppSettingsCellPadding;
+ valueSliderFrame.size.width = InAppSettingsScreenWidth-(InAppSettingsTotalTablePadding+InAppSettingsTotalCellPadding);
+ self.valueSlider.frame = valueSliderFrame;
+
+ self.valueSlider.value = [[self.setting getValue] floatValue];
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ //create the slider
+ self.valueSlider = [[UISlider alloc] initWithFrame:CGRectZero];
+ [self.valueSlider addTarget:self action:@selector(slideAction) forControlEvents:UIControlEventTouchUpInside];
+ [self.contentView addSubview:self.valueSlider];
+}
+
+- (void)dealloc{
+ [valueSlider release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.h (revision 805)
@@ -0,0 +1,24 @@
+//
+// PSToggleSwitchSpecifier.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSTextFieldSpecifierCell : InAppSettingsTableCell {
+ UITextField *textField;
+}
+
+@property (nonatomic, retain) UITextField *textField;
+
+- (BOOL)isSecure;
+- (UIKeyboardType)getKeyboardType;
+- (UITextAutocapitalizationType)getAutocapitalizationType;
+- (UITextAutocorrectionType)getAutocorrectionType;
+- (void)textChangeAction;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.h (revision 805)
@@ -0,0 +1,35 @@
+//
+// InAppSettingsTableCell.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsSpecifier.h"
+
+@interface InAppSettingsTableCell : UITableViewCell {
+ InAppSettingsSpecifier *setting;
+ UILabel *titleLabel, *valueLabel;
+ UIControl *valueInput;
+ BOOL canSelectCell;
+}
+
+@property (nonatomic, retain) InAppSettingsSpecifier *setting;
+@property (nonatomic, retain) UILabel *titleLabel, *valueLabel;
+@property (nonatomic, assign) UIControl *valueInput;
+@property (nonatomic, assign) BOOL canSelectCell;
+
+- (void)setTitle;
+- (void)setDetail;
+- (void)setDetail:(NSString *)detail;
+- (void)setDisclosure:(BOOL)disclosure;
+
+- (void)setValueDelegate:(id)delegate;
+
+- (void)setupCell;
+- (void)setUIValues;
+- (id)initWithReuseIdentifier:(NSString *)reuseIdentifier;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSChildPaneSpecifierCell.m (revision 805)
@@ -0,0 +1,27 @@
+//
+// PSToggleSwitchSpecifier.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSChildPaneSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSChildPaneSpecifierCell
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ [self setDisclosure:YES];
+ self.canSelectCell = YES;
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSMultiValueSpecifierCell.m (revision 805)
@@ -0,0 +1,41 @@
+//
+// PSToggleSwitchSpecifier.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSMultiValueSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSMultiValueSpecifierCell
+
+- (NSString *)getValueTitle{
+ NSArray *titles = [self.setting valueForKey:InAppSettingsSpecifierTitles];
+ NSArray *values = [self.setting valueForKey:InAppSettingsSpecifierValues];
+
+ id obj = [self.setting getValue];
+ NSLog(@"%@",obj);
+ NSInteger valueIndex = [values indexOfObject:[self.setting getValue]];
+ if((valueIndex >= 0) && (valueIndex < (NSInteger)[titles count])){
+ return InAppSettingsLocalize([titles objectAtIndex:valueIndex], self.setting.stringsTable);
+ }
+ return nil;
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+ [self setDetail:[self getValueTitle]];
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ [self setDisclosure:YES];
+ self.canSelectCell = YES;
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSTextFieldSpecifierCell.m (revision 805)
@@ -0,0 +1,137 @@
+//
+// PSToggleSwitchSpecifier.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSTextFieldSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSTextFieldSpecifierCell
+
+@synthesize textField;
+
+#pragma mark helper methods
+
+- (BOOL)isSecure{
+ NSNumber *isSecure = [self.setting valueForKey:@"IsSecure"];
+ if(!isSecure){
+ return NO;
+ }
+ return [isSecure boolValue];
+}
+
+- (UIKeyboardType)getKeyboardType{
+ NSString *keyboardType = [self.setting valueForKey:@"KeyboardType"];
+ if([keyboardType isEqualToString:@"NumbersAndPunctuation"]){
+ return UIKeyboardTypeNumbersAndPunctuation;
+ }
+ else if([keyboardType isEqualToString:@"NumberPad"]){
+ return UIKeyboardTypeNumberPad;
+ }
+ else if([keyboardType isEqualToString:@"URL"]){
+ return UIKeyboardTypeURL;
+ }
+ else if([keyboardType isEqualToString:@"EmailAddress"]){
+ return UIKeyboardTypeEmailAddress;
+ }
+
+ return UIKeyboardTypeAlphabet;
+}
+
+- (UITextAutocapitalizationType)getAutocapitalizationType{
+ //this works, but the real settings don't seem to respect these values eventhough they are in the docs
+ NSString *autoCapitalizationType = [self.setting valueForKey:@"AutoCapitalizationType"];
+ if([autoCapitalizationType isEqualToString:@"Words"]){
+ return UITextAutocapitalizationTypeWords;
+ }
+ else if([autoCapitalizationType isEqualToString:@"Sentences"]){
+ return UITextAutocapitalizationTypeSentences;
+ }
+ else if([autoCapitalizationType isEqualToString:@"AllCharacters"]){
+ return UITextAutocapitalizationTypeAllCharacters;
+ }
+ return UITextAutocapitalizationTypeNone;
+}
+
+- (UITextAutocorrectionType)getAutocorrectionType{
+ NSString *autocorrectionType = [self.setting valueForKey:@"AutocorrectionType"];
+ if([autocorrectionType isEqualToString:@"Yes"]){
+ return UITextAutocorrectionTypeYes;
+ }
+ else if([autocorrectionType isEqualToString:@"No"]){
+ return UITextAutocorrectionTypeNo;
+ }
+ return UITextAutocorrectionTypeDefault;
+}
+
+- (void)textChangeAction{
+ NSNumber* isNumtype = [self.setting valueForKey:InAppSettingsSpecifierInAppNumtype];
+
+ if ( [isNumtype boolValue] ){
+ NSNumber* n = [NSNumber numberWithInt:[self.textField.text intValue]];
+ [self.setting setValue:n];
+ }
+ else
+ [self.setting setValue:self.textField.text];
+}
+
+#pragma mark cell controlls
+
+- (void)setValueDelegate:(id)delegate{
+ self.textField.delegate = delegate;
+ [super setValueDelegate:delegate];
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+
+ CGRect textFieldFrame = self.textField.frame;
+ CGSize titleSize = [titleLabel.text sizeWithFont:titleLabel.font];
+ textFieldFrame.origin.x = (CGFloat)round(titleSize.width+InAppSettingsTotalTablePadding);
+ if(textFieldFrame.origin.x < InAppSettingsCellTextFieldMinX){
+ textFieldFrame.origin.x = InAppSettingsCellTextFieldMinX;
+ }
+ textFieldFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(titleSize.height*0.5f))-InAppSettingsOffsetY;
+ textFieldFrame.size.width = (CGFloat)round((InAppSettingsScreenWidth-(InAppSettingsTotalTablePadding+InAppSettingsCellPadding))-textFieldFrame.origin.x);
+ textFieldFrame.size.height = titleSize.height;
+ self.textField.frame = textFieldFrame;
+ self.textField.text = [[self.setting getValue] description];
+
+ //keyboard traits
+ self.textField.secureTextEntry = [self isSecure];
+ self.textField.keyboardType = [self getKeyboardType];
+ self.textField.autocapitalizationType = [self getAutocapitalizationType];
+ self.textField.autocorrectionType = [self getAutocorrectionType];
+
+ //these are set here so they are set per cell
+ //self.textField.delegate = self;
+ self.valueInput = self.textField;
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ //create text field
+ self.textField =[[UITextField alloc] initWithFrame:CGRectZero];
+ self.textField.textColor = InAppSettingsBlue;
+ self.textField.adjustsFontSizeToFitWidth = YES;
+
+ //THIS IS NOT THE BEHAVIOR OF THE SETTINGS APP
+ //but we need a way to dismiss the keyboard
+ self.textField.returnKeyType = UIReturnKeyDone;
+
+ [self.textField addTarget:self action:@selector(textChangeAction) forControlEvents:UIControlEventEditingChanged];
+ [self.contentView addSubview:self.textField];
+}
+
+- (void)dealloc{
+ [textField release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsTableCell.m (revision 805)
@@ -0,0 +1,155 @@
+//
+// InAppSettingsTableCell.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsTableCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsTableCell
+
+@synthesize setting;
+@synthesize titleLabel, valueLabel;
+@synthesize valueInput;
+@synthesize canSelectCell;
+
+#pragma mark Cell lables
+
+- (void)setTitle{
+ self.titleLabel.text = [self.setting localizedTitle];
+
+ CGSize titleSize = [self.titleLabel.text sizeWithFont:self.titleLabel.font];
+
+ CGFloat maxTitleWidth = InAppSettingsCellTitleMaxWidth;
+ if([self.setting isType:InAppSettingsPSToggleSwitchSpecifier]){
+ maxTitleWidth = InAppSettingsCellTitleMaxWidth-(InAppSettingsCellToggleSwitchWidth+InAppSettingsCellPadding);
+ }else if(self.accessoryType == UITableViewCellAccessoryDisclosureIndicator){
+ maxTitleWidth = InAppSettingsCellTitleMaxWidth-(InAppSettingsCellDisclosureIndicatorWidth+InAppSettingsCellPadding);
+ }
+ if(titleSize.width > maxTitleWidth){
+ titleSize.width = maxTitleWidth;
+ }
+
+ CGRect titleFrame = self.titleLabel.frame;
+ titleFrame.size = titleSize;
+ titleFrame.origin.x = InAppSettingsCellPadding;
+ titleFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(titleSize.height*0.5f))-InAppSettingsOffsetY;
+ self.titleLabel.frame = titleFrame;
+}
+
+- (void)setDetail{
+ [self setDetail:[self.setting getValue]];
+}
+
+- (void)setDetail:(NSString *)detail{
+ //the detail is not localized
+ self.valueLabel.text = detail;
+
+ CGSize valueSize = [self.valueLabel.text sizeWithFont:self.valueLabel.font];
+
+ CGRect valueFrame = self.valueLabel.frame;
+ CGFloat titleRightSide = self.titleLabel.frame.size.width+InAppSettingsTablePadding;
+ if([self.setting isType:InAppSettingsPSMultiValueSpecifier] && [[self.setting localizedTitle] length] == 0){
+ valueFrame.origin.x = InAppSettingsCellPadding;
+ }else{
+ valueFrame.origin.x = (InAppSettingsScreenWidth-(InAppSettingsTotalTablePadding+InAppSettingsCellPadding))-valueSize.width;
+ if(self.accessoryType == UITableViewCellAccessoryDisclosureIndicator){
+ valueFrame.origin.x -= InAppSettingsCellDisclosureIndicatorWidth+InAppSettingsCellPadding;
+ }
+ if(titleRightSide >= valueFrame.origin.x){
+ valueFrame.origin.x = titleRightSide;
+ }
+ }
+ valueFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(valueSize.height*0.5f))-InAppSettingsOffsetY;
+ valueFrame.size.width = InAppSettingsScreenWidth-(valueFrame.origin.x+InAppSettingsTotalTablePadding+InAppSettingsCellPadding);
+ if(self.accessoryType == UITableViewCellAccessoryDisclosureIndicator){
+ valueFrame.size.width -= InAppSettingsCellDisclosureIndicatorWidth+InAppSettingsCellPadding;
+ }
+
+ //if the width is less then 0 just hide the label
+ if(valueFrame.size.width <= 0){
+ self.valueLabel.hidden = YES;
+ }else{
+ self.valueLabel.hidden = NO;
+ }
+ valueFrame.size.height = valueSize.height;
+ self.valueLabel.frame = valueFrame;
+}
+
+- (void)setDisclosure:(BOOL)disclosure{
+ if(disclosure){
+ self.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ }
+ else{
+ self.accessoryType = UITableViewCellAccessoryNone;
+ }
+}
+
+- (void)setCanSelectCell:(BOOL)value{
+ if(value){
+ self.selectionStyle = UITableViewCellSelectionStyleBlue;
+ }else{
+ self.selectionStyle = UITableViewCellSelectionStyleNone;
+ }
+ canSelectCell = value;
+}
+
+#pragma mark -
+
+- (id)initWithReuseIdentifier:(NSString *)reuseIdentifier{
+ //the docs say UITableViewCellStyleValue1 is used for settings,
+ //but it doesn't look 100% the same so we will just draw our own UILabels
+ #if InAppSettingsUseNewCells
+ self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+ #else
+ self = [super initWithFrame:CGRectZero reuseIdentifier:reuseIdentifier];
+ #endif
+
+ if(self != nil){
+ self.canSelectCell = NO;
+ }
+
+ return self;
+}
+
+#pragma mark implement in cell
+
+- (void)setUIValues{
+ //implement this per cell type
+}
+
+- (void)setValueDelegate:(id)delegate{
+ //implement in cell
+}
+
+- (void)setupCell{
+ //setup title label
+ self.titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+ self.titleLabel.font = InAppSettingsBoldFont;
+ self.titleLabel.highlightedTextColor = [UIColor whiteColor];
+ self.titleLabel.backgroundColor = [UIColor clearColor];
+// self.titleLabel.backgroundColor = [UIColor greenColor];
+ [self.contentView addSubview:self.titleLabel];
+
+ //setup value label
+ self.valueLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+ self.valueLabel.font = InAppSettingsNormalFont;
+ self.valueLabel.textColor = InAppSettingsBlue;
+ self.valueLabel.highlightedTextColor = [UIColor whiteColor];
+ self.valueLabel.backgroundColor = [UIColor clearColor];
+// self.valueLabel.backgroundColor = [UIColor redColor];
+ [self.contentView addSubview:self.valueLabel];
+}
+
+- (void)dealloc{
+ [setting release];
+ [titleLabel release];
+ [valueLabel release];
+ self.valueInput = nil;
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.h (revision 805)
@@ -0,0 +1,22 @@
+//
+// PSToggleSwitchSpecifier.h
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "InAppSettingsTableCell.h"
+
+@interface InAppSettingsPSToggleSwitchSpecifierCell : InAppSettingsTableCell {
+ UISwitch *valueSwitch;
+}
+
+@property (nonatomic, retain) UISwitch *valueSwitch;
+
+- (BOOL)getBool;
+- (void)setBool:(BOOL)newValue;
+- (void)switchAction;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.h
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.h (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.h (revision 805)
@@ -0,0 +1,16 @@
+//
+// InAppSettingsPotiValueSpecifierCell.h
+// InAppSettingsTestApp
+//
+// Created by Frank Blumenberg on 04.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "InAppSettings.h"
+
+@interface InAppSettingsPotiValueSpecifierCell : InAppSettingsTableCell {}
+
+- (NSString *)getValueTitle;
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPSToggleSwitchSpecifierCell.m (revision 805)
@@ -0,0 +1,84 @@
+//
+// PSToggleSwitchSpecifier.m
+// InAppSettingsTestApp
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettingsPSToggleSwitchSpecifierCell.h"
+#import "InAppSettingsConstants.h"
+
+@implementation InAppSettingsPSToggleSwitchSpecifierCell
+
+@synthesize valueSwitch;
+
+// The value associated with the preference when the toggle switch
+// is in the ON position. The value type for this key can be any
+// scalar type, including Boolean, String, Number, Date, or Data.
+// If this key is not present, the default value type is a Boolean.
+
+- (BOOL)getBool{
+ id value = [self.setting getValue];
+ id trueValue = [self.setting valueForKey:@"TrueValue"];
+ id falseValue = [self.setting valueForKey:@"FalseValue"];
+
+ if([value isEqual:trueValue]){
+ return YES;
+ }
+
+ if([value isEqual:falseValue]){
+ return NO;
+ }
+
+ //if there is no true or false values the value has to be a bool
+ return [value boolValue];
+}
+
+- (void)setBool:(BOOL)newValue{
+ id value = [NSNumber numberWithBool:newValue];
+ if(newValue){
+ id trueValue = [self.setting valueForKey:@"TrueValue"];
+ if(trueValue){
+ value = trueValue;
+ }
+ }
+ else{
+ id falseValue = [self.setting valueForKey:@"FalseValue"];
+ if(falseValue){
+ value = falseValue;
+ }
+ }
+ [self.setting setValue:value];
+}
+
+- (void)switchAction{
+ [self setBool:[self.valueSwitch isOn]];
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+ self.valueSwitch.on = [self getBool];
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ //create the switch
+ self.valueSwitch = [[UISwitch alloc] initWithFrame:CGRectZero];
+ CGRect valueSwitchFrame = self.valueSwitch.frame;
+ valueSwitchFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(valueSwitchFrame.size.height*0.5f))-InAppSettingsOffsetY;
+ valueSwitchFrame.origin.x = (CGFloat)round((InAppSettingsScreenWidth-(InAppSettingsTotalTablePadding+InAppSettingsCellPadding))-valueSwitchFrame.size.width);
+ self.valueSwitch.frame = valueSwitchFrame;
+ [self.valueSwitch addTarget:self action:@selector(switchAction) forControlEvents:UIControlEventValueChanged];
+ [self.contentView addSubview:self.valueSwitch];
+}
+
+- (void)dealloc{
+ [valueSwitch release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.m
===================================================================
--- trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.m (revision 0)
+++ trunk/Classes/InAppSettings/Cells/InAppSettingsPotiValueSpecifierCell.m (revision 805)
@@ -0,0 +1,40 @@
+//
+// InAppSettingsPotiValueSpecifierCell.m
+// InAppSettingsTestApp
+//
+// Created by Frank Blumenberg on 04.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "InAppSettingsPotiValueSpecifierCell.h"
+
+
+@implementation InAppSettingsPotiValueSpecifierCell
+
+- (NSString *)getValueTitle{
+
+ NSNumber* value = [self.setting getValue];
+
+ int intValue=[value intValue];
+
+ if( intValue <= 245 )
+ return [NSString stringWithFormat:@"%@",value];
+
+ return [NSString stringWithFormat:NSLocalizedString(@"Poti%d",@"Potiname"),256-intValue];
+}
+
+- (void)setUIValues{
+ [super setUIValues];
+
+ [self setTitle];
+ [self setDetail:[self getValueTitle]];
+}
+
+- (void)setupCell{
+ [super setupCell];
+
+ [self setDisclosure:YES];
+ self.canSelectCell = YES;
+}
+
+@end
Index: trunk/Classes/InAppSettings/InAppSettings.m
===================================================================
--- trunk/Classes/InAppSettings/InAppSettings.m (revision 0)
+++ trunk/Classes/InAppSettings/InAppSettings.m (revision 805)
@@ -0,0 +1,375 @@
+//
+// InAppSettingsViewController.m
+// InAppSettings
+//
+// Created by David Keegan on 11/21/09.
+// Copyright 2009 InScopeApps{+}. All rights reserved.
+//
+
+#import "InAppSettings.h"
+#import "InAppSettingsConstants.h"
+#import "InAppSettingsPSMultiValueSpecifierTable.h"
+
+@implementation InAppSettings
+
++ (void) registerDefaults {
+ [[[InAppSettingsReaderRegisterDefaults alloc] init] release];
+}
+
+@end
+
+@implementation InAppSettingsModalViewController
+
+- (id) init {
+ InAppSettingsViewController * settings = [[InAppSettingsViewController alloc] init];
+
+ self = [[UINavigationController alloc] initWithRootViewController:settings];
+ [settings addDoneButton];
+ [settings release];
+ return self;
+}
+
+@end
+
+@implementation InAppSettingsViewController
+
+@synthesize file;
+@synthesize settingsTableView;
+@synthesize firstResponder;
+@synthesize settingsReader;
+@synthesize delegate;
+@synthesize dataSource;
+
+
+#pragma mark modal view
+
+- (void) dismissModalView {
+ [self.navigationController dismissModalViewControllerAnimated:YES];
+}
+
+- (void) addDoneButton {
+ UIBarButtonItem * doneButton = [[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemDone
+ target:self
+ action:@selector(dismissModalView)];
+
+ self.navigationItem.rightBarButtonItem = doneButton;
+ [doneButton release];
+}
+
+#pragma mark setup view
+
+- (id) initWithFile:(NSString *)inputFile {
+ self = [super init];
+ if (self != nil) {
+ self.file = inputFile;
+ }
+ return self;
+}
+
+- (void) viewDidLoad {
+ // setup the table
+ self.settingsTableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStyleGrouped];
+ self.settingsTableView.autoresizingMask = (UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight);
+ self.settingsTableView.delegate = self;
+ self.settingsTableView.dataSource = self;
+ [self.view addSubview:self.settingsTableView];
+
+ // if the title is nil set it to Settings
+ if (!self.title) {
+ self.title = NSLocalizedString(@"Settings", nil);
+ }
+
+ // load settigns plist
+ if (!self.file) {
+ self.file = InAppSettingsRootFile;
+ }
+
+ InAppSettingsReader* tmpSettingsReader = [[InAppSettingsReader alloc] initWithFile:self.file dataSource:dataSource];
+ self.settingsReader = tmpSettingsReader;
+ [tmpSettingsReader release];
+
+
+ // setup keyboard notification
+ self.firstResponder = nil;
+ [self registerForKeyboardNotifications];
+}
+
+- (void) viewWillAppear:(BOOL)animated {
+ self.firstResponder = nil;
+
+ self.settingsTableView.contentInset = UIEdgeInsetsZero;
+ self.settingsTableView.scrollIndicatorInsets = UIEdgeInsetsZero;
+
+ [self.settingsTableView reloadData];
+ [super viewWillAppear:animated];
+}
+
+- (void) viewWillDisappear:(BOOL)animated {
+ self.firstResponder = nil;
+ [super viewWillDisappear:animated];
+}
+
+- (void) dealloc {
+ self.firstResponder = nil;
+ self.delegate = nil;
+
+ [file release];
+ [settingsTableView release];
+ [settingsReader release];
+ [super dealloc];
+}
+
+#pragma mark text field cell delegate
+
+- (void) textFieldDidBeginEditing:(UITextField *)cellTextField {
+ self.firstResponder = cellTextField;
+
+ // TODO: find a better way to get the cell from the text view
+ NSIndexPath * indexPath = [self.settingsTableView indexPathForCell:(UITableViewCell *)[[cellTextField superview] superview]];
+ [self.settingsTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionMiddle animated:YES];
+}
+
+- (BOOL) textFieldShouldReturn:(UITextField *)cellTextField {
+ self.firstResponder = nil;
+ [cellTextField resignFirstResponder];
+ return YES;
+}
+
+#pragma mark keyboard notification
+
+- (void) registerForKeyboardNotifications {
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(keyboardWillShow:)
+ name:UIKeyboardWillShowNotification object:nil];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(keyboardWillHide:)
+ name:UIKeyboardWillHideNotification object:nil];
+}
+
+- (void) keyboardWillShow:(NSNotification *)notification {
+ if (self.firstResponder == nil) {
+ // get the keybaord rect
+ CGRect keyboardRect = [[[notification userInfo] objectForKey:UIKeyboardBoundsUserInfoKey] CGRectValue];
+
+ // determin the bottom inset for the table view
+ UIEdgeInsets settingsTableInset = self.settingsTableView.contentInset;
+ CGPoint tableViewScreenSpace = [self.settingsTableView.superview convertPoint:self.settingsTableView.frame.origin toView:nil];
+ CGFloat tableViewBottomOffset = InAppSettingsScreenHeight - (tableViewScreenSpace.y + self.settingsTableView.frame.size.height);
+ settingsTableInset.bottom = keyboardRect.size.height - tableViewBottomOffset;
+
+ [UIView beginAnimations:nil context:nil];
+ [UIView setAnimationDuration:InAppSettingsKeyboardAnimation];
+ [UIView setAnimationBeginsFromCurrentState:YES];
+ self.settingsTableView.contentInset = settingsTableInset;
+ self.settingsTableView.scrollIndicatorInsets = settingsTableInset;
+ [UIView commitAnimations];
+ }
+}
+
+- (void) keyboardWillHide:(NSNotification *)notification {
+ if (self.firstResponder == nil) {
+ [UIView beginAnimations:nil context:nil];
+ [UIView setAnimationDuration:InAppSettingsKeyboardAnimation];
+ [UIView setAnimationBeginsFromCurrentState:YES];
+ self.settingsTableView.contentInset = UIEdgeInsetsZero;
+ self.settingsTableView.scrollIndicatorInsets = UIEdgeInsetsZero;
+ [UIView commitAnimations];
+ }
+}
+
+#pragma mark specifier delegate
+
+- (void) settingsSpecifierUpdated:(InAppSettingsSpecifier *)specifier {
+ if ([self.delegate respondsToSelector:@selector(InAppSettingsValue:forKey:)]) {
+ [self.delegate InAppSettingsValue:[specifier getValue] forKey:[specifier getKey]];
+ }
+}
+
+#pragma mark Table view methods
+
+- (InAppSettingsSpecifier *) settingAtIndexPath:(NSIndexPath *)indexPath {
+ return [[self.settingsReader.settings objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
+}
+
+- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ return [self.settingsReader.headers count];
+}
+
+- (NSString *) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+ return [self.settingsReader.headers objectAtIndex:section];
+}
+
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [[self.settingsReader.settings objectAtIndex:section] count];
+}
+
+- (CGFloat) tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section {
+ if (InAppSettingsDisplayPowered && [self.file isEqualToString:InAppSettingsRootFile] && section == (NSInteger)[self.settingsReader.headers count] - 1) {
+ return InAppSettingsPowerFooterHeight;
+ }
+ return 0.0f;
+}
+
+- (UIView *) tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
+ if (InAppSettingsDisplayPowered && [self.file isEqualToString:InAppSettingsRootFile] && section == (NSInteger)[self.settingsReader.headers count] - 1) {
+ UIView * powerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, InAppSettingsScreenWidth, InAppSettingsPowerFooterHeight)];
+
+ // InAppSettings label
+ CGSize InAppSettingsSize = [InAppSettingsProjectName sizeWithFont:InAppSettingsFooterFont];
+ CGPoint InAppSettingsPos = CGPointMake((CGFloat)round((InAppSettingsScreenWidth * 0.5f) - (InAppSettingsSize.width * 0.5f)),
+ (CGFloat)round((InAppSettingsPowerFooterHeight * 0.5f) - (InAppSettingsSize.height * 0.5f)) - 1);
+ UILabel * InAppLabel = [[UILabel alloc] initWithFrame:CGRectMake(InAppSettingsPos.x, InAppSettingsPos.y, InAppSettingsSize.width, InAppSettingsSize.height)];
+ InAppLabel.text = InAppSettingsProjectName;
+ InAppLabel.font = InAppSettingsFooterFont;
+ InAppLabel.backgroundColor = [UIColor clearColor];
+ InAppLabel.textColor = InAppSettingsFooterBlue;
+ InAppLabel.shadowColor = [UIColor whiteColor];
+ InAppLabel.shadowOffset = CGSizeMake(0.0f, 1.0f);
+ [powerView addSubview:InAppLabel];
+ [InAppLabel release];
+
+ // lighting bolts
+ CGPoint leftLightningBoltPos = CGPointMake(InAppSettingsPos.x - InAppSettingsLightingBoltSize,
+ (CGFloat)round((InAppSettingsPowerFooterHeight * 0.5f) - (InAppSettingsLightingBoltSize * 0.5f)));
+ InAppSettingsLightningBolt * leftLightningBolt = [[InAppSettingsLightningBolt alloc]
+ initWithFrame:CGRectMake(leftLightningBoltPos.x, leftLightningBoltPos.y,
+ InAppSettingsLightingBoltSize, InAppSettingsLightingBoltSize)];
+ [powerView addSubview:leftLightningBolt];
+ [leftLightningBolt release];
+
+ CGPoint rightLightningBoltPos = CGPointMake((CGFloat)round(InAppSettingsPos.x + InAppSettingsSize.width), leftLightningBoltPos.y);
+ InAppSettingsLightningBolt * rightLightningBolt = [[InAppSettingsLightningBolt alloc]
+ initWithFrame:CGRectMake(rightLightningBoltPos.x, rightLightningBoltPos.y,
+ InAppSettingsLightingBoltSize, InAppSettingsLightingBoltSize)];
+ rightLightningBolt.flip = YES;
+ [powerView addSubview:rightLightningBolt];
+ [rightLightningBolt release];
+
+ return [powerView autorelease];
+ }
+ return nil;
+}
+
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ InAppSettingsSpecifier * setting = [self settingAtIndexPath:indexPath];
+
+ setting.delegate = self;
+
+ // get the NSClass for a specifier, if there is none use the base class InAppSettingsTableCell
+ NSString * cellType = [setting cellName];
+ Class nsclass = NSClassFromString(cellType);
+ if (!nsclass) {
+ cellType = @"InAppSettingsTableCell";
+ nsclass = NSClassFromString(cellType);
+ }
+
+ InAppSettingsTableCell * cell = ((InAppSettingsTableCell *)[tableView dequeueReusableCellWithIdentifier:cellType]);
+ if (cell == nil) {
+ cell = [[[nsclass alloc] initWithReuseIdentifier:cellType] autorelease];
+ // setup the cells controlls
+ [cell setupCell];
+ }
+
+ // set the values of the cell, this is separated from setupCell for reloading the table
+ cell.setting = setting;
+ [cell setValueDelegate:self];
+ [cell setUIValues];
+
+ return cell;
+}
+
+- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ InAppSettingsSpecifier * setting = [self settingAtIndexPath:indexPath];
+
+ if ([setting isType:InAppSettingsPSMultiValueSpecifier]) {
+ InAppSettingsPSMultiValueSpecifierTable * multiValueSpecifier = [[InAppSettingsPSMultiValueSpecifierTable alloc] initWithSetting:setting];
+ [self.navigationController pushViewController:multiValueSpecifier animated:YES];
+ [multiValueSpecifier release];
+ } else if ([setting isType:InAppSettingsPSChildPaneSpecifier]) {
+
+ if ( [setting valueForKey:InAppSettingsSpecifierInAppChildPaneClass] ) {
+
+ UIViewController * childPane;
+
+ Class childPaneClass = NSClassFromString([setting valueForKey:InAppSettingsSpecifierInAppChildPaneClass]);
+ if ( [childPaneClass conformsToProtocol:@protocol(InAppSettingsChildPane)] ) {
+ childPane = [[childPaneClass alloc] initWithSetting:setting];
+ } else {
+ childPane = [[childPaneClass alloc] init];
+ }
+
+ childPane.title = [setting localizedTitle];
+ [self.navigationController pushViewController:childPane animated:YES];
+ [childPane release];
+ } else {
+
+ InAppSettingsViewController * childPane = [[InAppSettingsViewController alloc] initWithFile:[setting valueForKey:InAppSettingsSpecifierFile]];
+ childPane.title = [setting localizedTitle];
+ childPane.dataSource = self.dataSource;
+ [self.navigationController pushViewController:childPane animated:YES];
+ [childPane release];
+ }
+ } else if ([setting isType:InAppSettingsPSTitleValueSpecifier]) {
+ InAppSettingsOpenUrl([NSURL URLWithString:[setting valueForKey:InAppSettingsSpecifierInAppURL]]);
+ }
+}
+
+- (NSIndexPath *) tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ InAppSettingsTableCell * cell = ((InAppSettingsTableCell *)[tableView cellForRowAtIndexPath:indexPath]);
+
+ if ([cell.setting isType:@"PSTextFieldSpecifier"]) {
+ [cell.valueInput becomeFirstResponder];
+ } else if (cell.canSelectCell) {
+ [self.firstResponder resignFirstResponder];
+ return indexPath;
+ }
+ return nil;
+}
+
+@end
+
+@implementation InAppSettingsLightningBolt
+
+@synthesize flip;
+
+- (id) initWithFrame:(CGRect)frame {
+ self = [super initWithFrame:frame];
+ if (self != nil) {
+ self.flip = NO;
+ self.backgroundColor = [UIColor clearColor];
+ }
+ return self;
+}
+
+- (void) drawRect:(CGRect)rect {
+ CGContextRef context = UIGraphicsGetCurrentContext();
+
+ CGContextSetFillColorWithColor(context, [InAppSettingsFooterBlue CGColor]);
+ #if __IPHONE_3_2
+ CGContextSetShadowWithColor(context, CGSizeMake(0.0f, 1.0f), 0.0f, [[UIColor whiteColor] CGColor]);
+ #else
+ CGContextSetShadowWithColor(context, CGSizeMake(0.0f, -1.0f), 0.0f, [[UIColor whiteColor] CGColor]);
+ #endif
+ if (self.flip) {
+ CGContextMoveToPoint(context, 4.0f, 1.0f);
+ CGContextAddLineToPoint(context, 13.0f, 1.0f);
+ CGContextAddLineToPoint(context, 10.0f, 5.0f);
+ CGContextAddLineToPoint(context, 12.0f, 7.0f);
+ CGContextAddLineToPoint(context, 2.0f, 15.0f);
+ CGContextAddLineToPoint(context, 5.0f, 7.0f);
+ CGContextAddLineToPoint(context, 3.0f, 5.0f);
+ } else {
+ CGContextMoveToPoint(context, 3.0f, 1.0f);
+ CGContextAddLineToPoint(context, 12.0f, 1.0f);
+ CGContextAddLineToPoint(context, 13.0f, 5.0f);
+ CGContextAddLineToPoint(context, 11.0f, 7.0f);
+ CGContextAddLineToPoint(context, 14.0f, 15.0f);
+ CGContextAddLineToPoint(context, 4.0f, 7.0f);
+ CGContextAddLineToPoint(context, 6.0f, 5.0f);
+ }
+ CGContextFillPath(context);
+}
+
+@end
Index: trunk/Classes/TMPMainViewController.h
===================================================================
--- trunk/Classes/TMPMainViewController.h (revision 0)
+++ trunk/Classes/TMPMainViewController.h (revision 805)
@@ -0,0 +1,52 @@
+/////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+
+@class DisclosureDetailController;
+
+typedef enum{
+ MKConnectionStateDisconnected,
+ MKConnectionStateConnecting,
+ MKConnectionStateConnected
+} MKConnectionState;
+
+@interface RootViewController : UITableViewController {
+
+ MKConnectionState connectionState;
+ NSString* _versionString;
+
+ NSArray *_controllers;
+}
+
+@property (nonatomic, retain) NSArray *controllers;
+@property(nonatomic,retain) NSString* versionString;
+
+- (void)userDidDisconnect;
+- (void)userDidCancelLastConnectRequest;
+- (void)connectionRequestDidFail:(NSNotification *)aNotification;
+- (void)connectionRequestDidSucceed:(NSNotification *)aNotification;
+- (void)disconnected:(NSNotification *)aNotification;
+
+@end
Index: trunk/Classes/Views/EngineTestViewController.m
===================================================================
--- trunk/Classes/Views/EngineTestViewController.m (revision 0)
+++ trunk/Classes/Views/EngineTestViewController.m (revision 805)
@@ -0,0 +1,189 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+#import "EngineValues.h"
+#import "EngineTestViewController.h"
+#import "EngineTestSliderCell.h"
+#import "TTCorePreprocessorMacros.h"
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+@interface EngineTestViewController ()
+- (IBAction)engineValueChangedForAllAction:(UISlider *)sender;
+- (IBAction)engineValueChangedAction:(UISlider *)sender;
+@end
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+@implementation EngineTestViewController
+
+#pragma mark -
+#pragma mark View lifecycle
+
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ UIBarButtonItem* spacer;
+ spacer = [[[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+ target:nil
+ action:nil] autorelease];
+
+ NSArray* segmentItems = [NSArray arrayWithObjects:@"Quadro",@"Hexa",@"Okto",nil];
+ segment = [[UISegmentedControl alloc] initWithItems:segmentItems];
+ segment.segmentedControlStyle=UISegmentedControlStyleBar;
+
+ [segment addTarget:self
+ action:@selector(changeDevice)
+ forControlEvents:UIControlEventValueChanged];
+
+ UIBarButtonItem* segmentButton;
+ segmentButton = [[[UIBarButtonItem alloc]
+ initWithCustomView:segment] autorelease];
+
+ [self setToolbarItems:[NSArray arrayWithObjects:spacer,segmentButton,spacer,nil]];
+
+ segment.selectedSegmentIndex=0;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+- (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+
+ engineValues = [[EngineValues alloc] init];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+ [engineValues start];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ [engineValues stop];
+ TT_RELEASE_SAFELY(engineValues);
+}
+
+- (void)viewDidDisappear:(BOOL)animated {
+ [super viewDidDisappear:animated];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ // Return the number of sections.
+ return 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+
+ if(section==0)
+ return 1;
+
+ // Return the number of rows in the section.
+ static NSInteger numberOfRows[3]={4,6,8};
+ return numberOfRows[segment.selectedSegmentIndex];
+}
+
+- (IBAction) changeDevice {
+ [self.tableView reloadData];
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ static NSString *CellIdentifier = @"MotorTestSliderCell";
+
+ EngineTestSliderCell *cell = (EngineTestSliderCell*)[tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[EngineTestSliderCell alloc] initWithReuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ if(indexPath.section==0 ) {
+ cell.textLabel.text = [NSString stringWithFormat:@"All", [indexPath row]];
+
+ [cell.valueSlider addTarget:self
+ action:@selector(engineValueChangedForAllAction:)
+ forControlEvents:UIControlEventValueChanged ];
+ }
+ else {
+
+ cell.textLabel.text = [NSString stringWithFormat:@"Motor %d", [indexPath row]+1];
+ cell.valueSlider.tag = indexPath.row;
+
+ [cell.valueSlider addTarget:self
+ action:@selector(engineValueChangedAction:)
+ forControlEvents:UIControlEventValueChanged];
+ }
+
+ return cell;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (IBAction)engineValueChangedForAllAction:(UISlider *)sender {
+ [engineValues setValueForAllEngines:(uint8_t)(sender.value*255.0)];
+}
+
+- (IBAction)engineValueChangedAction:(UISlider *)sender {
+ NSInteger theEngine=sender.tag;
+ [engineValues setValueForEngine:theEngine value:(uint8_t)(sender.value*255.0)];
+}
+
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view delegate
+
+- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ return nil;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+}
+
+- (void)viewDidUnload {
+ TT_RELEASE_SAFELY(segment);
+}
+
+
+- (void)dealloc {
+ TT_RELEASE_SAFELY(engineValues);
+ [super dealloc];
+}
+
+
+@end
+
Index: trunk/Classes/Views/EngineTestSliderCell.m
===================================================================
--- trunk/Classes/Views/EngineTestSliderCell.m (revision 0)
+++ trunk/Classes/Views/EngineTestSliderCell.m (revision 805)
@@ -0,0 +1,71 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "EngineTestSliderCell.h"
+#import "InAppSettingsConstants.h"
+
+
+#define kUISliderWidth 160.0
+#define kUISliderHeight 24.0
+
+@implementation EngineTestSliderCell
+
+@synthesize valueSlider;
+
+- (void)slideAction{
+}
+
+- (id)initWithReuseIdentifier:(NSString *)reuseIdentifier{
+
+ self = [super initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:reuseIdentifier];
+
+ if(self) {
+
+ CGRect frame = CGRectMake(126.0, 20.0, kUISliderWidth, kUISliderHeight);
+ valueSlider = [[UISlider alloc] initWithFrame:frame];
+
+ self.valueSlider.minimumValue = 0;
+ self.valueSlider.maximumValue = 1;
+ self.valueSlider.value = 0;
+
+ CGRect valueSliderFrame = self.valueSlider.frame;
+ valueSliderFrame.origin.y = (CGFloat)round((self.contentView.frame.size.height*0.5f)-(valueSliderFrame.size.height*0.5f));
+ valueSliderFrame.origin.x = 85;
+ valueSliderFrame.size.width = InAppSettingsScreenWidth-(InAppSettingsTotalTablePadding+InAppSettingsCellPadding+85);
+ self.valueSlider.frame = valueSliderFrame;
+
+ [self.valueSlider addTarget:self action:@selector(slideAction) forControlEvents:UIControlEventTouchUpInside];
+ [self.contentView addSubview:self.valueSlider];
+
+ self.detailTextLabel.hidden = YES;
+ }
+ return self;
+}
+
+- (void)dealloc{
+ [valueSlider release];
+ [super dealloc];
+}
+
+@end
Index: trunk/Classes/Views/OsdViewController.xib
===================================================================
--- trunk/Classes/Views/OsdViewController.xib (revision 0)
+++ trunk/Classes/Views/OsdViewController.xib (revision 805)
@@ -0,0 +1,400 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">117</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUITextView" id="780293185">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrameSize">{320, 460}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <bool key="IBUIEditable">NO</bool>
+ <string key="IBUIText">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocapitalizationType">2</int>
+ <int key="IBUIAutocorrectionType">1</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 460}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">errorCode</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="780293185"/>
+ </object>
+ <int key="connectionID">11</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="780293185"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">10</int>
+ <reference key="object" ref="780293185"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>10.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>OsdViewController</string>
+ <string>UIResponder</string>
+ <string>{{556, 412}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">11</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Communication/AsyncSocket.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">OsdViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">errorCode</string>
+ <string key="NS.object.0">UITextView</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">errorCode</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">errorCode</string>
+ <string key="candidateClassName">UITextView</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Views/OsdViewController.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="809824876">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="809824876"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIScrollView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITextView</string>
+ <string key="superclassName">UIScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../iKopter.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">117</string>
+ </data>
+</archive>
Index: trunk/Classes/Views/AnalogValues.h
===================================================================
--- trunk/Classes/Views/AnalogValues.h (revision 0)
+++ trunk/Classes/Views/AnalogValues.h (revision 805)
@@ -0,0 +1,51 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+#import <Foundation/Foundation.h>
+
+@protocol AnalogValuesDelegate
+
+- (void) didReceiveValues;
+- (void) didReceiveLabelForIndexPath:(NSIndexPath *)indexPath;
+- (void) changed;
+
+@end
+
+@interface AnalogValues : NSObject {
+
+ NSMutableArray * analogLabels;
+ NSMutableArray * debugData;
+
+ int debugResponseCounter;
+
+ id<AnalogValuesDelegate> _delegate;
+}
+
+@property(assign) id<AnalogValuesDelegate> delegate;
+
+-(NSUInteger) count;
+-(NSString*) labelAtIndexPath:(NSIndexPath *)indexPath;
+-(NSString*) valueAtIndexPath:(NSIndexPath *)indexPath;
+-(void) reloadAll;
+
+@end
Index: trunk/Classes/Views/OsdValue.h
===================================================================
--- trunk/Classes/Views/OsdValue.h (revision 0)
+++ trunk/Classes/Views/OsdValue.h (revision 805)
@@ -0,0 +1,45 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "MKDatatypes.h"
+
+@protocol OsdValueDelegate
+
+- (void) newValue:(NaviData_t*)data;
+
+@end
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@interface OsdValue : NSObject {
+
+ int lcdCount;
+
+ id<OsdValueDelegate> _delegate;
+}
+
+@property(assign) id<OsdValueDelegate> delegate;
+
+@end
Index: trunk/Classes/Views/MixerTableViewCell.xib
===================================================================
--- trunk/Classes/Views/MixerTableViewCell.xib (revision 0)
+++ trunk/Classes/Views/MixerTableViewCell.xib (revision 805)
@@ -0,0 +1,728 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">117</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="3"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUITableViewCell" id="684850097">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">292</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIView" id="47298535">
+ <reference key="NSNextResponder" ref="684850097"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUILabel" id="7233095">
+ <reference key="NSNextResponder" ref="47298535"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, -1}, {76, 44}}</string>
+ <reference key="NSSuperview" ref="47298535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">Motor 12</string>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <nil key="IBUIHighlightedColor"/>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <float key="IBUIMinimumFontSize">10</float>
+ </object>
+ <object class="IBUITextField" id="1064268958">
+ <reference key="NSNextResponder" ref="47298535"/>
+ <int key="NSvFlags">276</int>
+ <string key="NSFrame">{{104, 6}, {46, 31}}</string>
+ <reference key="NSSuperview" ref="47298535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <string key="IBUIText">64</string>
+ <int key="IBUIBorderStyle">3</int>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ <object class="NSColorSpace" key="NSCustomColorSpace" id="345427065">
+ <int key="NSID">2</int>
+ </object>
+ </object>
+ <object class="NSFont" key="IBUIFont" id="596156169">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">17</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <int key="IBUITextAlignment">1</int>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIKeyboardType">2</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBUITextField" id="262474921">
+ <reference key="NSNextResponder" ref="47298535"/>
+ <int key="NSvFlags">276</int>
+ <string key="NSFrame">{{154, 6}, {46, 31}}</string>
+ <reference key="NSSuperview" ref="47298535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <string key="IBUIText">64</string>
+ <int key="IBUIBorderStyle">3</int>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ <reference key="NSCustomColorSpace" ref="345427065"/>
+ </object>
+ <reference key="IBUIFont" ref="596156169"/>
+ <int key="IBUITextAlignment">1</int>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIKeyboardType">2</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBUITextField" id="247606810">
+ <reference key="NSNextResponder" ref="47298535"/>
+ <int key="NSvFlags">276</int>
+ <string key="NSFrame">{{204, 6}, {46, 31}}</string>
+ <reference key="NSSuperview" ref="47298535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <string key="IBUIText">64</string>
+ <int key="IBUIBorderStyle">3</int>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ <reference key="NSCustomColorSpace" ref="345427065"/>
+ </object>
+ <reference key="IBUIFont" ref="596156169"/>
+ <int key="IBUITextAlignment">1</int>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIKeyboardType">2</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBUITextField" id="896007779">
+ <reference key="NSNextResponder" ref="47298535"/>
+ <int key="NSvFlags">276</int>
+ <string key="NSFrame">{{254, 6}, {46, 31}}</string>
+ <reference key="NSSuperview" ref="47298535"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIContentVerticalAlignment">0</int>
+ <string key="IBUIText">64</string>
+ <int key="IBUIBorderStyle">3</int>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MAA</bytes>
+ <reference key="NSCustomColorSpace" ref="345427065"/>
+ </object>
+ <reference key="IBUIFont" ref="596156169"/>
+ <int key="IBUITextAlignment">1</int>
+ <float key="IBUIMinimumFontSize">17</float>
+ <object class="IBUITextInputTraits" key="IBUITextInputTraits">
+ <int key="IBUIAutocorrectionType">1</int>
+ <int key="IBUIKeyboardType">2</int>
+ <int key="IBUIReturnKeyType">9</int>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 44}</string>
+ <reference key="NSSuperview" ref="684850097"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">4</int>
+ <bool key="IBUIMultipleTouchEnabled">YES</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 44}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUISeparatorStyle">1</int>
+ <reference key="IBUIContentView" ref="47298535"/>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cellTextGas</string>
+ <reference key="source" ref="684850097"/>
+ <reference key="destination" ref="1064268958"/>
+ </object>
+ <int key="connectionID">13</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cellTextNick</string>
+ <reference key="source" ref="684850097"/>
+ <reference key="destination" ref="262474921"/>
+ </object>
+ <int key="connectionID">14</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cellTextRoll</string>
+ <reference key="source" ref="684850097"/>
+ <reference key="destination" ref="247606810"/>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cellTextYaw</string>
+ <reference key="source" ref="684850097"/>
+ <reference key="destination" ref="896007779"/>
+ </object>
+ <int key="connectionID">16</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">cellLabel</string>
+ <reference key="source" ref="684850097"/>
+ <reference key="destination" ref="7233095"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">loadCell</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="684850097"/>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">exitEditing:</string>
+ <reference key="source" ref="1064268958"/>
+ <reference key="destination" ref="975951072"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">20</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">exitEditing:</string>
+ <reference key="source" ref="896007779"/>
+ <reference key="destination" ref="975951072"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">21</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">exitEditing:</string>
+ <reference key="source" ref="262474921"/>
+ <reference key="destination" ref="975951072"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">22</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">exitEditing:</string>
+ <reference key="source" ref="247606810"/>
+ <reference key="destination" ref="975951072"/>
+ <int key="IBEventType">20</int>
+ </object>
+ <int key="connectionID">23</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">3</int>
+ <reference key="object" ref="684850097"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="896007779"/>
+ <reference ref="7233095"/>
+ <reference ref="1064268958"/>
+ <reference ref="262474921"/>
+ <reference ref="247606810"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="7233095"/>
+ <reference key="parent" ref="684850097"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="1064268958"/>
+ <reference key="parent" ref="684850097"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6</int>
+ <reference key="object" ref="262474921"/>
+ <reference key="parent" ref="684850097"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">7</int>
+ <reference key="object" ref="247606810"/>
+ <reference key="parent" ref="684850097"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">8</int>
+ <reference key="object" ref="896007779"/>
+ <reference key="parent" ref="684850097"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>3.CustomClassName</string>
+ <string>3.IBEditorWindowLastContentRect</string>
+ <string>3.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ <string>6.IBPluginDependency</string>
+ <string>7.IBPluginDependency</string>
+ <string>8.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>MixerViewController</string>
+ <string>UIResponder</string>
+ <string>MixerTableViewCell</string>
+ <string>{{561, 851}, {320, 44}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">23</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">MixerTableViewCell</string>
+ <string key="superclassName">UITableViewCell</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">exitEditing:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">exitEditing:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">exitEditing:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cellLabel</string>
+ <string>cellTextGas</string>
+ <string>cellTextNick</string>
+ <string>cellTextRoll</string>
+ <string>cellTextYaw</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>UITextField</string>
+ <string>UITextField</string>
+ <string>UITextField</string>
+ <string>UITextField</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cellLabel</string>
+ <string>cellTextGas</string>
+ <string>cellTextNick</string>
+ <string>cellTextRoll</string>
+ <string>cellTextYaw</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cellLabel</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cellTextGas</string>
+ <string key="candidateClassName">UITextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cellTextNick</string>
+ <string key="candidateClassName">UITextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cellTextRoll</string>
+ <string key="candidateClassName">UITextField</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">cellTextYaw</string>
+ <string key="candidateClassName">UITextField</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Views/MixerTableViewCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MixerViewController</string>
+ <string key="superclassName">UITableViewController</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">loadCell</string>
+ <string key="NS.object.0">MixerTableViewCell</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">loadCell</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">loadCell</string>
+ <string key="candidateClassName">MixerTableViewCell</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Views/MixerViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">MixerViewController</string>
+ <string key="superclassName">UITableViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBUserSource</string>
+ <string key="minorKey"/>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Communication/AsyncSocket.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="597246348">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="597246348"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableViewCell</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableViewCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITableViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITableViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UITextField</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="114971829">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <reference key="sourceIdentifier" ref="114971829"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3100" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../iKopter.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <string key="IBCocoaTouchPluginVersion">117</string>
+ </data>
+</archive>
Index: trunk/Classes/Views/MixerViewController.h
===================================================================
--- trunk/Classes/Views/MixerViewController.h (revision 0)
+++ trunk/Classes/Views/MixerViewController.h (revision 805)
@@ -0,0 +1,20 @@
+//
+// MIxerViewController.h
+// iKopter
+//
+// Created by Frank Blumenberg on 03.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class MixerTableViewCell;
+
+@interface MixerViewController : UITableViewController {
+
+ MixerTableViewCell* loadCell;
+}
+
+@property (nonatomic, retain) IBOutlet MixerTableViewCell *loadCell;
+
+@end
Index: trunk/Classes/Views/OsdViewController.h
===================================================================
--- trunk/Classes/Views/OsdViewController.h (revision 0)
+++ trunk/Classes/Views/OsdViewController.h (revision 805)
@@ -0,0 +1,24 @@
+//
+// OsdViewController.h
+// iKopter
+//
+// Created by Frank Blumenberg on 06.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "OsdValue.h"
+
+@interface OsdViewController : UIViewController<OsdValueDelegate> {
+
+ UITextView* errorCode;
+ OsdValue* osdValue;
+
+ double rotateX;
+ double rotateY;
+
+}
+
+@property (nonatomic, retain) IBOutlet UITextView* errorCode;
+
+@end
Index: trunk/Classes/Views/EngineValues.h
===================================================================
--- trunk/Classes/Views/EngineValues.h (revision 0)
+++ trunk/Classes/Views/EngineValues.h (revision 805)
@@ -0,0 +1,42 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+#import <Foundation/Foundation.h>
+
+
+@interface EngineValues : NSObject {
+
+ uint8_t values[16];
+ NSTimer* updateTimer;
+
+}
+
+-(void)start;
+-(void)stop;
+-(void)setValueForEngine:(NSInteger)theEngine value:(uint8_t)newValue;
+-(void)setValueForAllEngines:(uint8_t)newValue;
+
+-(uint8_t) valueAtIndexPath:(NSIndexPath *)indexPath;
+-(uint8_t) valueForEngine:(NSInteger)theEngine;
+
+@end
Index: trunk/Classes/Views/AnalogValues.m
===================================================================
--- trunk/Classes/Views/AnalogValues.m (revision 0)
+++ trunk/Classes/Views/AnalogValues.m (revision 805)
@@ -0,0 +1,221 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "AnalogValues.h"
+#import "TTGlobalCorePaths.h"
+#import "TTCorePreprocessorMacros.h"
+
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+
+#define kAnalogLabelFile @"analoglables.plist"
+
+@interface AnalogValues (Private)
+- (void) analogLabelNotification:(NSNotification *)aNotification;
+- (void) debugValueNotification:(NSNotification *)aNotification;
+- (void) requestAnalogLabelForIndex:(NSInteger)index;
+- (void) requestDebugData;
+
+- (void) loadLabels;
+- (void) saveLabels;
+- (void) initNotifications;
+
+@end
+
+@implementation AnalogValues
+
+@synthesize delegate = _delegate;
+
+- (id) init
+{
+ self = [super init];
+ if (self != nil) {
+
+ debugData = [[NSMutableArray alloc] initWithCapacity:kMaxDebugData];
+ for (int i = 0; i < kMaxDebugData; i++) {
+ [debugData addObject:[NSNumber numberWithInt:0]];
+ }
+
+ [self loadLabels];
+ [self initNotifications];
+ }
+
+ return self;
+}
+
+- (void) dealloc {
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+
+ [analogLabels release];
+ [debugData release];
+ [super dealloc];
+}
+
+-(void) loadLabels {
+
+ NSString *filePath = TTPathForDocumentsResource(kAnalogLabelFile);
+
+ if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
+
+ DLog(@"Load the analog labels from %@",filePath);
+
+ analogLabels = [[NSMutableArray alloc] initWithContentsOfFile:filePath];
+ }
+ else {
+
+ analogLabels = [[NSMutableArray alloc] initWithCapacity:4];
+ for(int d=0;d<4;d++) {
+
+ NSMutableArray* analogLabelsDevice = [NSMutableArray arrayWithCapacity:kMaxDebugData];
+ for (int i = 0; i < kMaxDebugData; i++) {
+ [analogLabelsDevice addObject:[NSString stringWithFormat:@"Analog%d", i]];
+ }
+ [analogLabels addObject:analogLabelsDevice];
+ }
+
+ [self saveLabels];
+ }
+}
+
+-(void) saveLabels {
+
+ NSString *filePath = TTPathForDocumentsResource(kAnalogLabelFile);
+ [analogLabels writeToFile:filePath atomically:NO];
+}
+
+-(void) initNotifications {
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+
+ [nc addObserver:self
+ selector:@selector(analogLabelNotification:)
+ name:MKDebugLabelNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(debugValueNotification:)
+ name:MKDebugDataNotification
+ object:nil];
+
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (void) requestAnalogLabelForIndex:(NSInteger)theIndex {
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t index = theIndex;
+
+ NSData * data = [NSData dataWithCommand:MKCommandDebugLabelRequest
+ forAddress:MKAddressAll
+ payloadWithBytes:&index
+ length:1];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) analogLabelNotification:(NSNotification *)aNotification {
+
+ NSString * label = [[aNotification userInfo] objectForKey:kMKDataKeyLabel];
+ NSInteger index = [[[aNotification userInfo] objectForKey:kMKDataKeyIndex] intValue];
+ NSUInteger address=[MKConnectionController sharedMKConnectionController].currentDevice;
+
+ if ([label length] > 0) {
+ // label=[NSString stringWithFormat:@"%@ %d",label,[label length]];
+ NSMutableArray* a=[analogLabels objectAtIndex:address];
+ [a replaceObjectAtIndex:index withObject:label];
+ }
+
+ DLog(@"([%d][%d] %@",address , index, label);
+
+ if (index < (kMaxDebugData-1)) {
+ [self requestAnalogLabelForIndex:index+1];
+ }
+ else {
+ [self saveLabels];
+ }
+
+ [self.delegate didReceiveLabelForIndexPath:[NSIndexPath indexPathForRow:index inSection:0]];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (void) requestDebugData {
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t interval = 50;
+
+ NSData * data = [NSData dataWithCommand:MKCommandDebugValueRequest
+ forAddress:MKAddressAll
+ payloadWithBytes:&interval
+ length:1];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) debugValueNotification:(NSNotification *)aNotification {
+ NSArray * newDebugData = [[aNotification userInfo] objectForKey:kMKDataKeyDebugData];
+
+ for (int i = 0; i < [newDebugData count]; i++) {
+ [debugData replaceObjectAtIndex:i withObject:[newDebugData objectAtIndex:i]];
+ }
+
+ if (debugResponseCounter++ > 4 ) {
+ [self requestDebugData];
+ debugResponseCounter = 0;
+ }
+
+ [self.delegate didReceiveValues];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+-(void) reloadAll {
+
+ [self performSelector:@selector(requestDebugData) withObject:self afterDelay:0.1];
+
+ [self requestAnalogLabelForIndex:0];
+}
+
+-(NSUInteger) count {
+ return [debugData count];
+}
+
+-(NSString*) labelAtIndexPath:(NSIndexPath *)indexPath {
+ NSUInteger address=[MKConnectionController sharedMKConnectionController].currentDevice;
+ NSMutableArray* a=[analogLabels objectAtIndex:address];
+
+ return [a objectAtIndex:indexPath.row];
+}
+
+-(NSString*) valueAtIndexPath:(NSIndexPath *)indexPath {
+ return [[debugData objectAtIndex:indexPath.row] description];
+}
+
+@end
Index: trunk/Classes/Views/ChannelsViewCell.h
===================================================================
--- trunk/Classes/Views/ChannelsViewCell.h (revision 0)
+++ trunk/Classes/Views/ChannelsViewCell.h (revision 805)
@@ -0,0 +1,19 @@
+//
+// ChannelsViewCell.h
+// myKopter
+//
+// Created by Frank Blumenberg on 16.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface ChannelsViewCell : UITableViewCell {
+
+ UIProgressView* progressBar;
+}
+
+-(void)setChannelValue:(int16_t) value;
+
+@end
Index: trunk/Classes/Views/OsdValue.m
===================================================================
--- trunk/Classes/Views/OsdValue.m (revision 0)
+++ trunk/Classes/Views/OsdValue.m (revision 805)
@@ -0,0 +1,98 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "OsdValue.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+@interface OsdValue()
+- (void) sendOsdRefreshRequest;
+- (void) osdNotification:(NSNotification *)aNotification;
+@end
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+@implementation OsdValue
+
+@synthesize delegate=_delegate;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (id) init
+{
+ self = [super init];
+ if (self != nil) {
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+
+ [nc addObserver:self
+ selector:@selector(osdNotification:)
+ name:MKOsdNotification
+ object:nil];
+
+ [self performSelector:@selector(sendOsdRefreshRequest) withObject:self afterDelay:0.1];
+
+ }
+ return self;
+}
+
+- (void) dealloc
+{
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+
+ [super dealloc];
+}
+
+
+- (void) sendOsdRefreshRequest {
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t refresh=50;
+
+ NSData * data = [NSData dataWithCommand:MKCommandOsdRequest
+ forAddress:MKAddressFC
+ payloadForByte:refresh];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) osdNotification:(NSNotification *)aNotification {
+
+ NSData *value = [[aNotification userInfo] objectForKey:kMKDataKeyRawValue];
+
+ NaviData_t data;
+
+ memcpy(&data,[value bytes],sizeof(data));
+
+ [self.delegate newValue:&data];
+
+ NSLog(@"osdCount=%d",lcdCount);
+ if (lcdCount++ >= 7 ) {
+ [self sendOsdRefreshRequest];
+ lcdCount = 0;
+ }
+}
+
+@end
Index: trunk/Classes/Views/MixerTableViewCell.h
===================================================================
--- trunk/Classes/Views/MixerTableViewCell.h (revision 0)
+++ trunk/Classes/Views/MixerTableViewCell.h (revision 805)
@@ -0,0 +1,29 @@
+//
+// MixerTableViewCell.h
+// iKopter
+//
+// Created by Frank Blumenberg on 03.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+
+@interface MixerTableViewCell : UITableViewCell {
+ UILabel *cellLabel;
+ UITextField *cellTextGas;
+ UITextField *cellTextNick;
+ UITextField *cellTextRoll;
+ UITextField *cellTextYaw;
+}
+
+@property (nonatomic, retain) IBOutlet UILabel *cellLabel;
+@property (nonatomic, retain) IBOutlet UITextField *cellTextGas;
+@property (nonatomic, retain) IBOutlet UITextField *cellTextNick;
+@property (nonatomic, retain) IBOutlet UITextField *cellTextRoll;
+@property (nonatomic, retain) IBOutlet UITextField *cellTextYaw;
+
++ (NSString *)reuseIdentifier;
+-(IBAction) exitEditing:(id)sender;
+
+@end
Index: trunk/Classes/Views/MixerViewController.m
===================================================================
--- trunk/Classes/Views/MixerViewController.m (revision 0)
+++ trunk/Classes/Views/MixerViewController.m (revision 805)
@@ -0,0 +1,172 @@
+//
+// MIxerViewController.m
+// iKopter
+//
+// Created by Frank Blumenberg on 03.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import "MixerViewController.h"
+#import "MixerTableViewCell.h"
+
+@implementation MixerViewController
+
+@synthesize loadCell;
+
+#pragma mark -
+#pragma mark Initialization
+
+/*
+ - (id)initWithStyle:(UITableViewStyle)style {
+ // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+ if ((self = [super initWithStyle:style])) {
+ }
+ return self;
+ }
+ */
+
+
+#pragma mark -
+#pragma mark View lifecycle
+
+/*
+ - (void)viewDidLoad {
+ [super viewDidLoad];
+
+ // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
+ // self.navigationItem.rightBarButtonItem = self.editButtonItem;
+ }
+ */
+
+/*
+ - (void)viewWillAppear:(BOOL)animated {
+ [super viewWillAppear:animated];
+ }
+ */
+/*
+ - (void)viewDidAppear:(BOOL)animated {
+ [super viewDidAppear:animated];
+ }
+ */
+/*
+ - (void)viewWillDisappear:(BOOL)animated {
+ [super viewWillDisappear:animated];
+ }
+ */
+/*
+ - (void)viewDidDisappear:(BOOL)animated {
+ [super viewDidDisappear:animated];
+ }
+ */
+/*
+ // Override to allow orientations other than the default portrait orientation.
+ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+ }
+ */
+
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ // Return the number of sections.
+ return 1;
+}
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ // Return the number of rows in the section.
+ return 12;
+}
+
+
+// Customize the appearance of table view cells.
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ MixerTableViewCell *cell = (MixerTableViewCell *)[tableView dequeueReusableCellWithIdentifier:[MixerTableViewCell reuseIdentifier]];
+ if (cell == nil)
+ {
+ NSLog(@"Loading new cell");
+ [[NSBundle mainBundle] loadNibNamed:@"MixerTableViewCell" owner:self options:nil];
+ cell = loadCell;
+ self.loadCell = nil;
+ }
+ cell.cellLabel.text = [NSString stringWithFormat:@"Motor %d", [indexPath row]];
+ return cell;
+}
+
+
+/*
+ // Override to support conditional editing of the table view.
+ - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+ // Return NO if you do not want the specified item to be editable.
+ return YES;
+ }
+ */
+
+
+/*
+ // 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
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES];
+ }
+ 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 -
+#pragma mark Table view delegate
+
+- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ return nil;
+}
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Relinquish ownership any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
+ // For example: self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+ [loadCell release];
+
+ [super dealloc];
+}
+
+
+@end
+
Index: trunk/Classes/Views/OsdViewController.m
===================================================================
--- trunk/Classes/Views/OsdViewController.m (revision 0)
+++ trunk/Classes/Views/OsdViewController.m (revision 805)
@@ -0,0 +1,105 @@
+//
+// OsdViewController.m
+// iKopter
+//
+// Created by Frank Blumenberg on 06.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import "OsdViewController.h"
+#import "OsdValue.h"
+
+@implementation OsdViewController
+
+@synthesize errorCode;
+
+- (void) viewDidAppear:(BOOL)animated {
+
+ osdValue = [[OsdValue alloc] init];
+ osdValue.delegate = self;
+}
+
+- (void) viewWillDisappear:(BOOL)animated {
+ [osdValue release];
+}
+
+
+- (void) newValue:(NaviData_t *)data {
+
+ NSMutableString* info=[NSMutableString stringWithString:@"INFO\r\n"];
+
+ [info appendFormat:@"SatsInUse: %d\r\n",data->SatsInUse];
+ [info appendFormat:@"Altimeter: %d\r\n",data->Altimeter];
+ [info appendFormat:@"Variometer: %d\r\n",data->Variometer];
+ [info appendFormat:@"FlyingTime: %d\r\n",data->FlyingTime];
+ [info appendFormat:@"UBat: %d\r\n",data->UBat];
+ [info appendFormat:@"Heading: %d\r\n",data->Heading];
+ [info appendFormat:@"CompassHeading: %d\r\n",data->CompassHeading];
+ [info appendFormat:@"AngleNick: %d\r\n",data->AngleNick];
+ [info appendFormat:@"AngleRoll: %d\r\n",data->AngleRoll];
+ [info appendFormat:@"RC_Quality: %d\r\n",data->RC_Quality];
+ [info appendFormat:@"FCFlags: %d\r\n",data->FCFlags];
+ [info appendFormat:@"NCFlags: %d\r\n",data->NCFlags];
+ [info appendFormat:@"Errorcode: %d\r\n",data->Errorcode];
+ [info appendFormat:@"RC_RSSI: %d\r\n",data->RC_RSSI];
+ [info appendFormat:@"Current: %d\r\n",data->Current];
+ [info appendFormat:@"UsedCapacity: %d\r\n",data->UsedCapacity];
+
+ errorCode.text = info;
+
+ rotateX = data->AngleRoll;
+ rotateY = data->AngleNick;
+}
+
+- (void)drawRect:(CGRect)rect {
+
+}
+
+
+/*
+ // The designated initializer. Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+ if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
+ // Custom initialization
+ }
+ return self;
+}
+*/
+
+/*
+// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
+- (void)viewDidLoad {
+ [super viewDidLoad];
+}
+*/
+
+/*
+// Override to allow orientations other than the default portrait orientation.
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+*/
+
+
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ [super viewDidUnload];
+ // Release any retained subviews of the main view.
+ // e.g. self.myOutlet = nil;
+}
+
+
+- (void)dealloc {
+ [super dealloc];
+}
+
+
+@end
Index: trunk/Classes/Views/ChannelsViewController.h
===================================================================
--- trunk/Classes/Views/ChannelsViewController.h (revision 0)
+++ trunk/Classes/Views/ChannelsViewController.h (revision 805)
@@ -0,0 +1,36 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+
+@interface ChannelsViewController : UITableViewController {
+
+ int16_t channelValues[26];
+
+ NSTimer* _updateTimer;
+}
+
+@property(nonatomic,retain) NSTimer* updateTimer;
+
+@end
Index: trunk/Classes/Views/EngineValues.m
===================================================================
--- trunk/Classes/Views/EngineValues.m (revision 0)
+++ trunk/Classes/Views/EngineValues.m (revision 805)
@@ -0,0 +1,113 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "EngineValues.h"
+#import "TTCorePreprocessorMacros.h"
+
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+@interface EngineValues ()
+
+- (IBAction) writeValues;
+
+@end
+
+@implementation EngineValues
+
+- (id) init
+{
+ self = [super init];
+ if (self != nil) {
+ [self setValueForAllEngines:0];
+ [self writeValues];
+ }
+ return self;
+}
+
+- (void) dealloc
+{
+ [self setValueForAllEngines:0];
+ [self writeValues];
+ DLog(@"dealloc");
+ [super dealloc];
+}
+
+-(void)start {
+ [self stop];
+
+ updateTimer = [NSTimer scheduledTimerWithTimeInterval:0.5
+ target:self
+ selector:@selector(writeValues)
+ userInfo:nil
+ repeats:YES];
+
+}
+
+-(void)stop {
+ TT_INVALIDATE_TIMER(updateTimer);
+}
+
+-(void)setValueForEngine:(NSInteger)theEngine value:(uint8_t)newValue {
+ if (theEngine<0 || theEngine>=16 )
+ return;
+
+ DLog("New value for engine %d = %d",theEngine,newValue);
+ values[theEngine]=newValue;
+}
+
+-(void)setValueForAllEngines:(uint8_t)newValue {
+ DLog("New value for all %d",newValue);
+ memset(values,newValue,sizeof(values));
+}
+
+-(uint8_t) valueAtIndexPath:(NSIndexPath *)indexPath {
+ return [self valueForEngine:indexPath.row];
+}
+
+-(uint8_t) valueForEngine:(NSInteger)theEngine {
+
+ if (theEngine<0 || theEngine>=16 )
+ return 0;
+
+ return values[theEngine];
+}
+
+- (IBAction) writeValues {
+
+ MKConnectionController* cCtrl=[MKConnectionController sharedMKConnectionController];
+
+ DLog("values e[0] = %d",values[0]);
+
+ NSData * data = [NSData dataWithCommand:MKCommandEngineTestRequest
+ forAddress:MKAddressAll
+ payloadWithBytes:values
+ length:16];
+
+ [cCtrl sendRequest:data];
+}
+
+@end
Index: trunk/Classes/Views/ChannelsViewCell.m
===================================================================
--- trunk/Classes/Views/ChannelsViewCell.m (revision 0)
+++ trunk/Classes/Views/ChannelsViewCell.m (revision 805)
@@ -0,0 +1,43 @@
+//
+// ChannelsViewCell.m
+// myKopter
+//
+// Created by Frank Blumenberg on 16.05.10.
+// Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "ChannelsViewCell.h"
+
+#define kUIProgressBarWidth 160.0
+#define kUIProgressBarHeight 24.0
+
+@implementation ChannelsViewCell
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
+ if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier])) {
+
+ CGRect frame = CGRectMake(126.0, 20.0, kUIProgressBarWidth, kUIProgressBarHeight);
+ progressBar = [[UIProgressView alloc] initWithFrame:frame];
+ progressBar.progressViewStyle = UIProgressViewStyleDefault;
+ progressBar.progress = 0.5; // Initialization code
+
+ [self.contentView addSubview:progressBar];
+ }
+ return self;
+}
+
+- (void)dealloc {
+
+ [progressBar release];
+
+ [super dealloc];
+}
+
+-(void)setChannelValue:(int16_t)value {
+
+ progressBar.progress = (value+125)/250.0f;
+}
+
+
+
+@end
Index: trunk/Classes/Views/MixerTableViewCell.m
===================================================================
--- trunk/Classes/Views/MixerTableViewCell.m (revision 0)
+++ trunk/Classes/Views/MixerTableViewCell.m (revision 805)
@@ -0,0 +1,53 @@
+//
+// MixerTableViewCell.m
+// iKopter
+//
+// Created by Frank Blumenberg on 03.07.10.
+// Copyright 2010 de.frankblumenberg. All rights reserved.
+//
+
+#import "MixerTableViewCell.h"
+
+#define TABLE_CELL_IDENTIFIER @"Mixer Table Cell Identifier"
+
+@implementation MixerTableViewCell
+
+@synthesize cellLabel;
+@synthesize cellTextGas;
+@synthesize cellTextNick;
+@synthesize cellTextRoll;
+@synthesize cellTextYaw;
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+
+ [super setSelected:selected animated:animated];
+
+ // Configure the view for the selected state
+}
+
+
+- (void)dealloc {
+ [cellLabel release];
+ [cellTextGas release];
+ [cellTextNick release];
+ [cellTextRoll release];
+ [cellTextYaw release];
+ [super dealloc];
+}
+
++ (NSString *)reuseIdentifier
+{
+ return (NSString *)TABLE_CELL_IDENTIFIER;
+}
+- (NSString *)reuseIdentifier
+{
+ return [[self class] reuseIdentifier];
+}
+
+
+-(IBAction) exitEditing:(id)sender {
+ NSLog(@"exit editing");
+ [sender resignFirstResponder];
+}
+
+@end
Index: trunk/Classes/Views/LcdViewController.xib
===================================================================
--- trunk/Classes/Views/LcdViewController.xib (revision 0)
+++ trunk/Classes/Views/LcdViewController.xib (revision 805)
@@ -0,0 +1,720 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
+ <data>
+ <int key="IBDocument.SystemTarget">1024</int>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string key="NS.object.0">117</string>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="1"/>
+ </object>
+ <object class="NSArray" key="IBDocument.PluginDependencies">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys" id="0">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBProxyObject" id="372490531">
+ <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBProxyObject" id="975951072">
+ <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ <object class="IBUIView" id="191373211">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIToolbar" id="413362706">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">266</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUISegmentedControl" id="744325293">
+ <reference key="NSNextResponder" ref="413362706"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{101, 8}, {207, 30}}</string>
+ <reference key="NSSuperview" ref="413362706"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBSegmentControlStyle">2</int>
+ <int key="IBNumberOfSegments">3</int>
+ <int key="IBSelectedSegmentIndex">0</int>
+ <object class="NSArray" key="IBSegmentTitles">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NaviCtrl</string>
+ <string>FlightCtrl</string>
+ <string>3DMag</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentWidths">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ <real value="0.0"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentEnabledStates">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ <boolean value="YES"/>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentContentOffsets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ <string>{0, 0}</string>
+ </object>
+ <object class="NSMutableArray" key="IBSegmentImages">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSNull" id="4"/>
+ <reference ref="4"/>
+ <reference ref="4"/>
+ </object>
+ <object class="NSColor" key="IBTintColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC42IDAuNiAwLjYAA</bytes>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrame">{{0, 372}, {320, 44}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIBarStyle">1</int>
+ <object class="NSMutableArray" key="IBUIItems">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBUIBarButtonItem" id="33534649">
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">leftTriangle.png</string>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="413362706"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="22677797">
+ <object class="NSCustomResource" key="IBUIImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">rightTriangle.png</string>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <int key="IBUIStyle">1</int>
+ <reference key="IBUIToolbar" ref="413362706"/>
+ </object>
+ <object class="IBUIBarButtonItem" id="1071681565">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUIToolbar" ref="413362706"/>
+ <int key="IBUISystemItemIdentifier">5</int>
+ </object>
+ <object class="IBUIBarButtonItem" id="1027961169">
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <reference key="IBUICustomView" ref="744325293"/>
+ <reference key="IBUIToolbar" ref="413362706"/>
+ </object>
+ </object>
+ </object>
+ <object class="IBUILabel" id="102122369">
+ <reference key="NSNextResponder" ref="191373211"/>
+ <int key="NSvFlags">292</int>
+ <string key="NSFrame">{{20, 36}, {280, 176}}</string>
+ <reference key="NSSuperview" ref="191373211"/>
+ <bool key="IBUIOpaque">NO</bool>
+ <bool key="IBUIClipsSubviews">YES</bool>
+ <int key="IBUIContentMode">7</int>
+ <bool key="IBUIUserInteractionEnabled">NO</bool>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <string key="IBUIText">01234567890123456789</string>
+ <object class="NSFont" key="IBUIFont">
+ <string key="NSName">CourierNewPS-BoldMT</string>
+ <double key="NSSize">22</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSColor" key="IBUITextColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MSAxIDEAA</bytes>
+ </object>
+ <object class="NSColor" key="IBUIHighlightedColor">
+ <int key="NSColorSpace">10</int>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{84, 1}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAAVjFzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/
+y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/
+xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/
+xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/
+xczU/8XM1P/FzNL/y9LY/8vS2P/FzNT/xczU/8XM1P/FzNT/xczS/8vS2P/L0tj/xczU/8XM1P/FzNT/
+xczU/8XM0v/L0tj/y9LY/8XM1P/FzNT/xczU/8XM1P/FzNL/y9LY/8vS2P8ADQEAAAMAAAABAFQAAAEB
+AAMAAAABAAEAAAECAAMAAAAEAAAB+gEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABAAEAAAEXAAQAAAABAAABUAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ </object>
+ <string key="IBUIColorCocoaTouchKeyPath">groupTableViewBackgroundColor</string>
+ </object>
+ <object class="NSColor" key="IBUIShadowColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MCAwIDAAA</bytes>
+ </object>
+ <int key="IBUIBaselineAdjustment">1</int>
+ <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+ <float key="IBUIMinimumFontSize">10</float>
+ <int key="IBUINumberOfLines">4</int>
+ </object>
+ </object>
+ <string key="NSFrameSize">{320, 416}</string>
+ <reference key="NSSuperview"/>
+ <object class="NSColor" key="IBUIBackgroundColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC4yNTU0MzQ3ODI2IDAuMjU1NDM0NzgyNiAwLjI1NTQzNDc4MjYAA</bytes>
+ </object>
+ <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+ <object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
+ <bool key="IBUIPrompted">NO</bool>
+ </object>
+ <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ </object>
+ </object>
+ <object class="IBObjectContainer" key="IBDocument.Objects">
+ <object class="NSMutableArray" key="connectionRecords">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">view</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="191373211"/>
+ </object>
+ <int key="connectionID">3</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">label</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="102122369"/>
+ </object>
+ <int key="connectionID">15</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">prevScreen</string>
+ <reference key="source" ref="33534649"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">17</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">nextScreen</string>
+ <reference key="source" ref="22677797"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">18</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchOutletConnection" key="connection">
+ <string key="label">segment</string>
+ <reference key="source" ref="372490531"/>
+ <reference key="destination" ref="744325293"/>
+ </object>
+ <int key="connectionID">28</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">changeDevice</string>
+ <reference key="source" ref="744325293"/>
+ <reference key="destination" ref="372490531"/>
+ <int key="IBEventType">13</int>
+ </object>
+ <int key="connectionID">29</int>
+ </object>
+ </object>
+ <object class="IBMutableOrderedSet" key="objectRecords">
+ <object class="NSArray" key="orderedObjects">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBObjectRecord">
+ <int key="objectID">0</int>
+ <reference key="object" ref="0"/>
+ <reference key="children" ref="1000"/>
+ <nil key="parent"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1</int>
+ <reference key="object" ref="191373211"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="413362706"/>
+ <reference ref="102122369"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-1</int>
+ <reference key="object" ref="372490531"/>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">File's Owner</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">-2</int>
+ <reference key="object" ref="975951072"/>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">4</int>
+ <reference key="object" ref="413362706"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="33534649"/>
+ <reference ref="22677797"/>
+ <reference ref="1027961169"/>
+ <reference ref="1071681565"/>
+ </object>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">5</int>
+ <reference key="object" ref="33534649"/>
+ <reference key="parent" ref="413362706"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">14</int>
+ <reference key="object" ref="102122369"/>
+ <reference key="parent" ref="191373211"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">16</int>
+ <reference key="object" ref="22677797"/>
+ <reference key="parent" ref="413362706"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">24</int>
+ <reference key="object" ref="1027961169"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="744325293"/>
+ </object>
+ <reference key="parent" ref="413362706"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">19</int>
+ <reference key="object" ref="744325293"/>
+ <reference key="parent" ref="1027961169"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">25</int>
+ <reference key="object" ref="1071681565"/>
+ <reference key="parent" ref="413362706"/>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="flattenedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>-1.CustomClassName</string>
+ <string>-2.CustomClassName</string>
+ <string>1.IBEditorWindowLastContentRect</string>
+ <string>1.IBPluginDependency</string>
+ <string>14.IBPluginDependency</string>
+ <string>16.IBPluginDependency</string>
+ <string>19.IBPluginDependency</string>
+ <string>25.IBPluginDependency</string>
+ <string>4.IBPluginDependency</string>
+ <string>5.IBPluginDependency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>LcdViewController</string>
+ <string>UIResponder</string>
+ <string>{{713, 399}, {320, 480}}</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="unlocalizedProperties">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="activeLocalization"/>
+ <object class="NSMutableDictionary" key="localizations">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference key="dict.sortedKeys" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
+ </object>
+ <nil key="sourceID"/>
+ <int key="maxID">32</int>
+ </object>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">LcdViewController</string>
+ <string key="superclassName">UIViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>changeDevice</string>
+ <string>nextScreen</string>
+ <string>prevScreen</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>changeDevice</string>
+ <string>nextScreen</string>
+ <string>prevScreen</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">changeDevice</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">nextScreen</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">prevScreen</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>label</string>
+ <string>segment</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>UILabel</string>
+ <string>UISegmentedControl</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>label</string>
+ <string>segment</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">label</string>
+ <string key="candidateClassName">UILabel</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">segment</string>
+ <string key="candidateClassName">UISegmentedControl</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Views/LcdViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Classes/Communication/AsyncSocket.h</string>
+ </object>
+ </object>
+ </object>
+ <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSError.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSFileManager.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSKeyedArchiver.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSObject.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSRunLoop.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSThread.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURL.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">Foundation.framework/Headers/NSURLConnection.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIAccessibility.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINibLoading.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="875577386">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIResponder.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarButtonItem</string>
+ <string key="superclassName">UIBarItem</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarButtonItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIBarItem</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIBarItem.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIControl</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UILabel</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UILabel.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIResponder</string>
+ <string key="superclassName">NSObject</string>
+ <reference key="sourceIdentifier" ref="875577386"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchBar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchBar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISearchDisplayController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UISegmentedControl</string>
+ <string key="superclassName">UIControl</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISegmentedControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIToolbar</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIToolbar.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIView</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UINavigationController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIPopoverController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UISplitViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">UIViewController</string>
+ <string key="superclassName">UIResponder</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">UIKit.framework/Headers/UIViewController.h</string>
+ </object>
+ </object>
+ </object>
+ </object>
+ <int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
+ <integer value="1024" key="NS.object.0"/>
+ </object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
+ <integer value="3000" key="NS.object.0"/>
+ </object>
+ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+ <string key="IBDocument.LastKnownRelativeProjectPath">../../iKopter.xcodeproj</string>
+ <int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>leftTriangle.png</string>
+ <string>rightTriangle.png</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>{15, 18}</string>
+ <string>{15, 18}</string>
+ </object>
+ </object>
+ <string key="IBCocoaTouchPluginVersion">117</string>
+ </data>
+</archive>
Index: trunk/Classes/Views/ChannelsViewController.m
===================================================================
--- trunk/Classes/Views/ChannelsViewController.m (revision 0)
+++ trunk/Classes/Views/ChannelsViewController.m (revision 805)
@@ -0,0 +1,159 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "ChannelsViewController.h"
+#import "ChannelsViewCell.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+#define kAnalogLabelFile @"AnalogLables.plist"
+
+@interface ChannelsViewController (Private)
+- (void) channelsValueNotification:(NSNotification *)aNotification;
+- (void) requestChannelData;
+@end
+
+// ///////////////////////////////////////////////////////////////////////////////
+
+@implementation ChannelsViewController
+
+@synthesize updateTimer = _updateTimer;
+
+#pragma mark -
+#pragma mark View lifecycle
+
+- (void) viewDidLoad {
+ [super viewDidLoad];
+
+
+}
+
+- (void) viewWillAppear:(BOOL)animated {
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(channelsValueNotification:)
+ name:MKChannelValuesNotification
+ object:nil];
+
+ [super viewWillAppear:animated];
+
+ self.updateTimer = [NSTimer scheduledTimerWithTimeInterval:0.5
+ target:self
+ selector:@selector(requestChannelData)
+ userInfo:nil
+ repeats:YES];
+ [self requestChannelData];
+}
+
+- (void) viewDidDisappear:(BOOL)animated {
+
+ [self.updateTimer invalidate];
+ self.updateTimer=nil;
+ [_updateTimer release];
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+
+ [super viewDidDisappear:animated];
+}
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void) didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+}
+
+- (void) viewDidUnload {
+}
+
+- (void) dealloc {
+ [super dealloc];
+}
+
+// ////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (void) requestChannelData {
+
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ NSData * data = [NSData dataWithCommand:MKCommandChannelsValueRequest
+ forAddress:MKAddressFC
+ payloadWithBytes:NULL
+ length:0];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) channelsValueNotification:(NSNotification *)aNotification {
+
+ NSData* data = [[aNotification userInfo] objectForKey:kMKDataKeyChannels];
+
+ if([data length]>=sizeof(channelValues))
+ memcpy(channelValues, [data bytes], sizeof(channelValues));
+
+ [self.tableView reloadData];
+}
+
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ // Return the number of sections.
+ return 1;
+}
+
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return sizeof(channelValues);
+}
+
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString * CellIdentifier = @"ChannelsTableCell";
+
+ UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+
+ if (cell == nil) {
+ cell = [[[ChannelsViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ cell.textLabel.text = [NSString stringWithFormat:@"Channel %d",indexPath.row];
+ [(ChannelsViewCell*)cell setChannelValue:channelValues[indexPath.row]];
+ cell.detailTextLabel.hidden = YES;//.text = [NSString stringWithFormat:@"%d",channelValues[indexPath.row]];
+
+ return cell;
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (NSIndexPath *) tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ return nil;
+}
+
+@end
+
Index: trunk/Classes/Views/AnalogViewController.h
===================================================================
--- trunk/Classes/Views/AnalogViewController.h (revision 0)
+++ trunk/Classes/Views/AnalogViewController.h (revision 805)
@@ -0,0 +1,35 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+#import "AnalogValues.h"
+
+@interface AnalogViewController : UITableViewController<AnalogValuesDelegate> {
+
+ AnalogValues* values;
+ UISegmentedControl* segment;
+}
+- (IBAction) changeDevice;
+
+@end
Index: trunk/Classes/Views/LcdViewController.h
===================================================================
--- trunk/Classes/Views/LcdViewController.h (revision 0)
+++ trunk/Classes/Views/LcdViewController.h (revision 805)
@@ -0,0 +1,47 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+
+@interface LcdViewController : UIViewController {
+ UILabel * label;
+ int lcdCount;
+
+ UISegmentedControl* segment;
+
+ CGPoint gestureStartPoint;
+ BOOL canProcessNextGesture;
+}
+
+@property (nonatomic, retain) IBOutlet UILabel * label;
+@property (nonatomic, retain) IBOutlet UISegmentedControl* segment;
+
+@property CGPoint gestureStartPoint;
+
+- (IBAction) nextScreen;
+- (IBAction) prevScreen;
+- (IBAction) changeDevice;
+
+
+@end
Index: trunk/Classes/Views/EngineTestViewController.h
===================================================================
--- trunk/Classes/Views/EngineTestViewController.h (revision 0)
+++ trunk/Classes/Views/EngineTestViewController.h (revision 805)
@@ -0,0 +1,36 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+#import <UIKit/UIKit.h>
+
+@class EngineValues;
+
+@interface EngineTestViewController : UITableViewController {
+
+ EngineValues* engineValues;
+ UISegmentedControl* segment;
+}
+
+- (IBAction) changeDevice;
+
+@end
Index: trunk/Classes/Views/AnalogViewController.m
===================================================================
--- trunk/Classes/Views/AnalogViewController.m (revision 0)
+++ trunk/Classes/Views/AnalogViewController.m (revision 805)
@@ -0,0 +1,191 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "AnalogViewController.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+#import "TTCorePreprocessorMacros.h"
+
+// ///////////////////////////////////////////////////////////////////////////////
+
+@implementation AnalogViewController
+
+- (void) updateSegment {
+
+ if ([[MKConnectionController sharedMKConnectionController] hasNaviCtrl]) {
+ [segment setEnabled:YES forSegmentAtIndex:0];
+ [segment setEnabled:YES forSegmentAtIndex:1];
+ [segment setEnabled:YES forSegmentAtIndex:2];
+ }
+ else {
+ [segment setEnabled:NO forSegmentAtIndex:0];
+ [segment setEnabled:YES forSegmentAtIndex:1];
+ [segment setEnabled:NO forSegmentAtIndex:2];
+ }
+
+ MKAddress currentDevice=[MKConnectionController sharedMKConnectionController].currentDevice;
+ switch (currentDevice) {
+ case MKAddressNC:
+ segment.selectedSegmentIndex=0;
+ break;
+ case MKAddressFC:
+ segment.selectedSegmentIndex=1;
+ break;
+ case MKAddressMK3MAg:
+ segment.selectedSegmentIndex=2;
+ break;
+ default:
+ break;
+ }
+}
+
+#pragma mark -
+#pragma mark View lifecycle
+
+- (void) viewDidLoad {
+
+
+ UIBarButtonItem* spacer;
+ spacer = [[[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+ target:nil
+ action:nil] autorelease];
+
+ NSArray* segmentItems = [NSArray arrayWithObjects:@"NaviCtrl",@"FlightCtrl",@"MK3Mag",nil];
+ segment = [[UISegmentedControl alloc] initWithItems:segmentItems];
+ segment.segmentedControlStyle=UISegmentedControlStyleBar;
+
+ [segment addTarget:self
+ action:@selector(changeDevice)
+ forControlEvents:UIControlEventValueChanged];
+
+ UIBarButtonItem* segmentButton;
+ segmentButton = [[[UIBarButtonItem alloc]
+ initWithCustomView:segment] autorelease];
+
+ [self setToolbarItems:[NSArray arrayWithObjects:spacer,segmentButton,spacer,nil]];
+
+}
+
+- (void) viewWillAppear:(BOOL)animated {
+ values = [[AnalogValues alloc] init];
+ values.delegate = self;
+
+ [self updateSegment];
+}
+
+- (void) viewDidAppear:(BOOL)animated {
+ [values reloadAll];
+}
+
+- (void) viewDidDisappear:(BOOL)animated {
+
+ TT_RELEASE_SAFELY(values);
+}
+
+- (void) viewDidUnload {
+ TT_RELEASE_SAFELY(segment);
+}
+
+#pragma mark -
+
+-(void) reloadAll {
+ [values reloadAll];
+}
+
+- (IBAction) changeDevice {
+
+ [[MKConnectionController sharedMKConnectionController] activateNaviCtrl];
+
+ switch (segment.selectedSegmentIndex) {
+ case 1:
+ [[MKConnectionController sharedMKConnectionController] activateFlightCtrl];
+ break;
+ case 2:
+ [[MKConnectionController sharedMKConnectionController] activateMK3MAG];
+ break;
+ }
+
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ DLog(@"Device set to %d", cCtrl.currentDevice);
+
+ [self performSelector:@selector(reloadAll) withObject:self afterDelay:0.1];
+}
+
+
+
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger) numberOfSectionsInTableView:(UITableView *)tableView {
+ // Return the number of sections.
+ return 1;
+}
+
+- (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ return [values count];
+}
+
+- (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+ static NSString * CellIdentifier = @"AnalogTableCell";
+
+ UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ cell.textLabel.text = [values labelAtIndexPath:indexPath];
+ cell.detailTextLabel.text = [values valueAtIndexPath:indexPath];
+
+ return cell;
+}
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (NSIndexPath *) tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ return nil;
+}
+
+#pragma mark -
+#pragma mark Analog values delegate
+
+- (void) didReceiveValues {
+ [self.tableView reloadData];
+}
+
+- (void) didReceiveLabelForIndexPath:(NSIndexPath *)indexPath {
+ [self.tableView reloadData];
+}
+
+- (void) changed {
+ [self.tableView reloadData];
+}
+
+@end
+
Index: trunk/Classes/Views/LcdViewController.m
===================================================================
--- trunk/Classes/Views/LcdViewController.m (revision 0)
+++ trunk/Classes/Views/LcdViewController.m (revision 805)
@@ -0,0 +1,238 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "LcdViewController.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+@implementation LcdViewController
+
+@synthesize label;
+@synthesize segment;
+@synthesize gestureStartPoint;
+
+- (void) viewDidLoad {
+ label.text = @"Not connected\r\nNo data\r\n\r\n";
+ lcdCount = 0;
+ [super viewDidLoad];
+}
+
+#pragma mark -
+#pragma mark UIViewController delegate methods
+
+
+
+- (void) updateSegment {
+
+ if ([[MKConnectionController sharedMKConnectionController] hasNaviCtrl]) {
+ [segment setEnabled:YES forSegmentAtIndex:0];
+ [segment setEnabled:YES forSegmentAtIndex:1];
+ [segment setEnabled:YES forSegmentAtIndex:2];
+ }
+ else {
+ [segment setEnabled:NO forSegmentAtIndex:0];
+ [segment setEnabled:YES forSegmentAtIndex:1];
+ [segment setEnabled:NO forSegmentAtIndex:2];
+ }
+
+ MKAddress currentDevice=[MKConnectionController sharedMKConnectionController].currentDevice;
+ switch (currentDevice) {
+ case MKAddressNC:
+ segment.selectedSegmentIndex=0;
+ break;
+ case MKAddressFC:
+ segment.selectedSegmentIndex=1;
+ break;
+ case MKAddressMK3MAg:
+ segment.selectedSegmentIndex=2;
+ break;
+ default:
+ break;
+ }
+}
+
+// called after this controller's view will appear
+- (void)viewWillAppear:(BOOL)animated
+{
+ [self.navigationController setToolbarHidden:YES animated:NO];
+
+ // for aesthetic reasons (the background is black), make the nav bar black for this particular page
+ self.navigationController.navigationBar.barStyle = UIBarStyleBlackOpaque;
+
+ // match the status bar with the nav bar
+ [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleBlackOpaque;
+
+ [[MKConnectionController sharedMKConnectionController] activateNaviCtrl];
+ [self updateSegment];
+}
+
+- (void) viewDidAppear:(BOOL)animated {
+
+ canProcessNextGesture=YES;
+
+ // for aesthetic reasons (the background is black), make the nav bar black for this particular page
+ self.navigationController.navigationBar.barStyle = UIBarStyleBlackOpaque;
+
+ // match the status bar with the nav bar
+ [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleBlackOpaque;
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+
+ [nc addObserver:self
+ selector:@selector(lcdNotification:)
+ name:MKLcdNotification
+ object:nil];
+
+ [self performSelector:@selector(sendMenuRefreshRequest) withObject:self afterDelay:0.1];
+}
+
+- (void) viewWillDisappear:(BOOL)animated {
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+
+ [nc removeObserver:self];
+
+ // restore the nav bar and status bar color to default
+ self.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+ [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
+}
+
+
+- (void) sendMenuRequestForKeys:(uint8_t)keys;
+{
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t lcdReq[2];
+
+ lcdReq[0] = keys;
+ lcdReq[1] = 50;
+
+ NSData * data = [NSData dataWithCommand:MKCommandLcdRequest
+ forAddress:MKAddressFC
+ payloadWithBytes:lcdReq
+ length:2];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) sendMenuRefreshRequest {
+ [self sendMenuRequestForKeys:0xFF];
+}
+
+- (void) lcdNotification:(NSNotification *)aNotification {
+ NSArray * mr = [[aNotification userInfo] objectForKey:kMKDataKeyMenuRows];
+
+ label.text = [mr componentsJoinedByString:@"\r\n"];
+ if (lcdCount++ > 4 ) {
+ [self sendMenuRefreshRequest];
+ lcdCount = 0;
+ }
+}
+
+- (IBAction) changeDevice {
+
+ [[MKConnectionController sharedMKConnectionController] activateNaviCtrl];
+
+ switch (segment.selectedSegmentIndex) {
+ case 1:
+ [[MKConnectionController sharedMKConnectionController] activateFlightCtrl];
+ break;
+ case 2:
+ [[MKConnectionController sharedMKConnectionController] activateMK3MAG];
+ break;
+ }
+
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ DLog(@"Device set to %d", cCtrl.currentDevice);
+
+ [self performSelector:@selector(sendMenuRefreshRequest) withObject:self afterDelay:0.1];
+}
+
+- (IBAction) nextScreen {
+ [self sendMenuRequestForKeys:0xFD];
+}
+
+- (IBAction) prevScreen {
+ [self sendMenuRequestForKeys:0xFE];
+}
+
+- (void) didReceiveMemoryWarning {
+ [super didReceiveMemoryWarning];
+}
+
+- (void) viewDidUnload {
+ [super viewDidUnload];
+}
+
+- (void) dealloc {
+ [super dealloc];
+}
+
+#pragma mark -
+
+#define kMinimumGestureLength 25
+#define kMaximumVariance 5
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+
+ UITouch *touch = [touches anyObject];
+ gestureStartPoint = [touch locationInView:self.view];
+
+}
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+
+ if (!canProcessNextGesture)
+ return;
+
+ UITouch *touch = [touches anyObject];
+ CGPoint currentPosition = [touch locationInView:self.view];
+
+ CGFloat deltaX = (gestureStartPoint.x - currentPosition.x);
+ CGFloat deltaY = (gestureStartPoint.y - currentPosition.y);
+
+ BOOL leftToRight=(deltaX<0);
+
+ NSLog(@"%f",deltaX);
+ deltaX = fabsf(deltaX);
+ deltaY = fabsf(deltaY);
+
+ if (deltaX >= kMinimumGestureLength && deltaY <= kMaximumVariance) {
+ if (leftToRight)
+ [self prevScreen];
+ else
+ [self nextScreen];
+
+ canProcessNextGesture=NO;
+
+ }
+ else if (deltaY >= kMinimumGestureLength && deltaX <= kMaximumVariance){
+ }
+
+}
+
+-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+ canProcessNextGesture=YES;
+}
+
+@end
Index: trunk/Classes/Views/EngineTestSliderCell.h
===================================================================
--- trunk/Classes/Views/EngineTestSliderCell.h (revision 0)
+++ trunk/Classes/Views/EngineTestSliderCell.h (revision 805)
@@ -0,0 +1,36 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+
+@interface EngineTestSliderCell : UITableViewCell {
+ UISlider *valueSlider;
+}
+
+@property (nonatomic, retain) UISlider *valueSlider;
+
+- (void)slideAction;
+- (id)initWithReuseIdentifier:(NSString *)reuseIdentifier;
+
+@end
Index: trunk/Classes/TMPMainViewController.m
===================================================================
--- trunk/Classes/TMPMainViewController.m (revision 0)
+++ trunk/Classes/TMPMainViewController.m (revision 805)
@@ -0,0 +1,411 @@
+/////////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#import "MainViewController.h"
+#import "InAppSettings.h"
+#import "Settings.h"
+#import "GradientButton.h"
+#import "MKConnectionController.h"
+#import "MKDataConstants.h"
+#import "MKIpConnection.h"
+#import "MKFakeConnection.h"
+#import "LcdViewController.h"
+#import "AnalogViewController.h"
+#import "SettingsSelectionViewController.h"
+
+#define CONNECT_SECTIONID 0
+
+@interface MainViewController (Private)
+
+-(void)initCellForConnectionButton:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+-(void)initCellForConnectionButtonDisconnected:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+-(void)initCellForConnectionButtonConnecting:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+-(void)initCellForConnectionButtonConnected:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+-(void)initCellForMenu:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath;
+
+@end
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+@implementation MainViewController
+
+@synthesize versionString = _versionString;
+@synthesize controllers = _controllers;
+
+#pragma mark -
+#pragma mark View lifecycle
+
+
+- (void)viewDidLoad {
+
+
+ self.title = @"µKopter";
+ //self.tableView.backgroundColor=[UIColor darkGrayColor];
+
+ NSMutableArray *array = [[NSMutableArray alloc] init];
+
+// SettingsMainViewController* settingsController = [[SettingsMainViewController alloc]
+// initWithNibName:@"SettingsMainViewController" bundle:nil];
+
+ SettingsSelectionViewController* settingsController = [[SettingsSelectionViewController alloc]
+ initWithStyle:UITableViewStyleGrouped];
+
+ settingsController.title = NSLocalizedString(@"Settings",@"Settings controller title");
+ [array addObject:settingsController];
+ [settingsController release];
+
+ LcdViewController* lcdController = [[LcdViewController alloc]
+ initWithNibName:@"LcdViewController" bundle:nil];
+
+ lcdController.title = NSLocalizedString(@"LCD Menu",@"LCD Menu controller title");
+ [array addObject:lcdController];
+ [lcdController release];
+
+
+ AnalogViewController* analogController = [[AnalogViewController alloc]
+ initWithStyle:UITableViewStylePlain];
+
+ analogController.title = NSLocalizedString(@"Analog Values",@"Analog values controller title");
+ [array addObject:analogController];
+ [analogController release];
+
+ self.controllers = array;
+ [array release];
+
+ connectionState=MKConnectionStateDisconnected;
+
+ //Disable tableview scrolling.
+ self.tableView.scrollEnabled = NO;
+
+ NSNotificationCenter* nc=[NSNotificationCenter defaultCenter];
+
+ [nc addObserver:self
+ selector:@selector(connectionRequestDidSucceed:)
+ name:MKConnectedNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(disconnected:)
+ name:MKDisconnectedNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(connectionRequestDidFail:)
+ name:MKDisconnectErrorNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(versionResponse:)
+ name:MKVersionNotification
+ object:nil];
+
+
+ [super viewDidLoad];
+}
+
+-(void) viewDidAppear:(BOOL)animated {
+ [self.tableView reloadData];
+}
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Relinquish ownership any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+
+ self.versionString=nil;
+ self.controllers = nil;
+ [super viewDidUnload];
+}
+
+- (void)dealloc {
+ [_versionString release];
+ [_controllers release];
+
+ [super dealloc];
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view data source
+
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+
+ if(section==CONNECT_SECTIONID)
+ return 1;
+
+ return connectionState==MKConnectionStateConnected?[self.controllers count]:0;
+}
+
+- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
+{
+ if (section!=CONNECT_SECTIONID)
+ return nil;
+
+ DLog(@"Footer for %d state %d",section,connectionState);
+
+ if(connectionState==MKConnectionStateConnected && self.versionString!=nil )
+ return self.versionString;
+
+ return NSLocalizedString(@"Not Connected",@"Connection version string");
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ DLog(@"%@ state %d",indexPath,connectionState);
+
+ static NSString *CellIdentifier = @"Cell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ if (indexPath.section==CONNECT_SECTIONID) {
+ [self initCellForConnectionButton:cell forRowAtIndexPath:indexPath];
+ }
+ else {
+ [self initCellForMenu:cell forRowAtIndexPath:indexPath];
+ }
+
+ return cell;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table cell initialization
+
+- (void)initCellForConnectionButton:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ cell.textLabel.text=[[NSUserDefaults standardUserDefaults] stringForKey:kHostnameKey];
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+
+ switch (connectionState) {
+ case MKConnectionStateConnected:
+ [self initCellForConnectionButtonConnected:cell forRowAtIndexPath:indexPath];
+ break;
+ case MKConnectionStateConnecting:
+ [self initCellForConnectionButtonConnecting:cell forRowAtIndexPath:indexPath];
+ break;
+ default:
+ [self initCellForConnectionButtonDisconnected:cell forRowAtIndexPath:indexPath];
+ break;
+ }
+}
+
+- (void)initCellForConnectionButtonDisconnected:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ cell.selectionStyle = UITableViewCellSelectionStyleNone;
+ cell.accessoryView = nil;
+ cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
+}
+
+- (UIView *) initCancelButton
+{
+ UIView *accView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 94, 35)];
+
+ GradientButton *cancelButton = [[GradientButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 63.0, 33.0)];
+
+ [cancelButton useRedDeleteStyle];
+ [cancelButton setTitle:NSLocalizedString(@"Abort",@"Conncetion abort button") forState:UIControlStateNormal];
+ [cancelButton addTarget:self action:@selector(userDidCancelLastConnectRequest) forControlEvents:UIControlEventTouchDown];
+ cancelButton.titleLabel.font = [UIFont boldSystemFontOfSize:14];
+
+ UIActivityIndicatorView *gear = [[[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray] autorelease];
+ gear.frame = CGRectMake(68.0, 5.5, 22.0, 22.0);
+ [gear startAnimating];
+
+ [accView addSubview:gear];
+ [accView addSubview:cancelButton];
+ return accView;
+}
+
+- (void)initCellForConnectionButtonConnecting:(UITableViewCell *)cell
+{
+ UIView *accView;
+ accView = [self initCancelButton];
+
+ cell.accessoryView = accView;
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ [accView release];
+}
+
+- (UIView *) initStopButton
+{
+ UIView *accView = [[UIView alloc] initWithFrame:CGRectMake(0.0, 0.0, 63, 35)];
+
+ GradientButton *stoplButton = [[GradientButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 63.0, 33.0)];
+
+ [stoplButton useAlertStyle];
+ [stoplButton setTitle:NSLocalizedString(@"Stop",@"Conncetion stop button") forState:UIControlStateNormal];
+ [stoplButton addTarget:self action:@selector(userDidDisconnect) forControlEvents:UIControlEventTouchDown];
+ stoplButton.titleLabel.font = [UIFont boldSystemFontOfSize:14];
+
+ [accView addSubview:stoplButton];
+ return accView;
+}
+
+- (void)initCellForConnectionButtonConnected:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ cell.detailTextLabel.text=@"Connected";
+
+ UIView *accView;
+ accView = [self initStopButton];
+
+ cell.accessoryView = accView;
+ cell.accessoryType = UITableViewCellAccessoryNone;
+ [accView release];
+}
+
+//-----------------------------------------------------------------------
+
+- (void)initCellForMenu:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ // Configure the cell
+ NSUInteger row = [indexPath row];
+ UIViewController *controller = [_controllers objectAtIndex:row];
+
+ cell.textLabel.text = controller.title;
+ cell.accessoryView = nil;
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Connection status actions (Statemachine)
+
+- (void)userDidDisconnect;
+{
+ [[MKConnectionController sharedMKConnectionController] stop];
+}
+
+- (void)userDidCancelLastConnectRequest;
+{
+ [[MKConnectionController sharedMKConnectionController] stop];
+ connectionState=MKConnectionStateDisconnected;
+ [self.tableView reloadData];
+}
+- (void)connectionRequestDidFail:(NSNotification *)aNotification;
+{
+ NSError* err = [[aNotification userInfo] objectForKey:@"error"];
+
+ UIAlertView *alert = [[UIAlertView alloc]
+ initWithTitle:NSLocalizedString(@"Server error", @"Server error")
+ message:[err localizedDescription]
+ delegate:self
+ cancelButtonTitle:@"Ok"
+ otherButtonTitles:nil];
+ [alert show];
+ [alert release];
+
+ [self.navigationController popToRootViewControllerAnimated:YES];
+
+ connectionState=MKConnectionStateDisconnected;
+ [self.tableView reloadData];
+}
+- (void)connectionRequestDidSucceed:(NSNotification *)aNotification;
+{
+ DLog(@"Got connected");
+
+ connectionState=MKConnectionStateConnected;
+ [self.tableView beginUpdates];
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationFade];
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:CONNECT_SECTIONID] withRowAnimation:UITableViewRowAnimationNone];
+ [self.tableView endUpdates];
+}
+- (void)disconnected:(NSNotification *)aNotification;
+{
+ connectionState=MKConnectionStateDisconnected;
+ [self.tableView beginUpdates];
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationBottom];
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:CONNECT_SECTIONID] withRowAnimation:UITableViewRowAnimationNone];
+ [self.tableView endUpdates];
+}
+
+- (void)versionResponse:(NSNotification *)aNotification;
+{
+ self.versionString = [[MKConnectionController sharedMKConnectionController]longVersionForAddress:MKAddressFC];
+
+ [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:CONNECT_SECTIONID] withRowAnimation:UITableViewRowAnimationNone];
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view delegate
+
+- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+
+ if (indexPath.section==CONNECT_SECTIONID) {
+ return (connectionState==MKConnectionStateDisconnected)?indexPath:nil;
+ }
+
+ return (connectionState==MKConnectionStateConnected)?indexPath:nil;
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ if (indexPath.section==CONNECT_SECTIONID && connectionState==MKConnectionStateDisconnected) {
+ UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
+ [self initCellForConnectionButtonConnecting:cell];
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ [[MKConnectionController sharedMKConnectionController] start];
+ }
+ else {
+
+ NSUInteger row = [indexPath row];
+ UIViewController* controller=[self.controllers objectAtIndex:row];
+
+ [self.navigationController pushViewController:controller animated:YES];
+ }
+
+}
+
+
+- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath {
+
+ if( [indexPath section]==0 && [indexPath row]==0 ) {
+ InAppSettingsViewController *settings = [[InAppSettingsViewController alloc] init];
+ [self.navigationController pushViewController:settings animated:YES];
+ }
+}
+
+
+@end
+
Index: trunk/Classes/iKopterAppDelegate.h
===================================================================
--- trunk/Classes/iKopterAppDelegate.h (revision 0)
+++ trunk/Classes/iKopterAppDelegate.h (revision 805)
@@ -0,0 +1,21 @@
+//
+// iKopterAppDelegate.h
+// iKopter
+//
+// Created by Frank Blumenberg on 20.06.10.
+// Copyright de.frankblumenberg 2010. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface iKopterAppDelegate : NSObject <UIApplicationDelegate> {
+
+ UIWindow *window;
+ UINavigationController *navigationController;
+}
+
+@property (nonatomic, retain) IBOutlet UIWindow *window;
+@property (nonatomic, retain) IBOutlet UINavigationController *navigationController;
+
+@end
+
Index: trunk/Classes/Hosts/MKHostViewController.h
===================================================================
--- trunk/Classes/Hosts/MKHostViewController.h (revision 0)
+++ trunk/Classes/Hosts/MKHostViewController.h (revision 805)
@@ -0,0 +1,40 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+#import "InAppSettings.h"
+
+@class MKHost;
+
+@interface MKHostViewController : InAppSettingsViewController<InAppSettingsDatasource> {
+
+ MKHost* _host;
+}
+
+@property(nonatomic,retain) MKHost* host;
+
+- (id)initWithHost:(MKHost*)theHost;
+
+
+@end
Index: trunk/Classes/Hosts/MKHost.h
===================================================================
--- trunk/Classes/Hosts/MKHost.h (revision 0)
+++ trunk/Classes/Hosts/MKHost.h (revision 805)
@@ -0,0 +1,40 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+
+
+@interface MKHost : NSObject<NSCoding, NSCopying> {
+ NSString* _name;
+ NSString* _address;
+ NSUInteger _port;
+ NSString* _connectionClass;
+}
+
+@property(retain) NSString* name;
+@property(retain) NSString* address;
+@property(assign) NSUInteger port;
+@property(retain) NSString* connectionClass;
+
+@end
Index: trunk/Classes/Hosts/MKHosts.h
===================================================================
--- trunk/Classes/Hosts/MKHosts.h (revision 0)
+++ trunk/Classes/Hosts/MKHosts.h (revision 805)
@@ -0,0 +1,42 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+
+@class MKHost;
+
+@interface MKHosts : NSObject {
+
+ NSMutableArray* hosts;
+}
+
+-(NSUInteger) count;
+
+-(MKHost*) hostAtIndexPath:(NSIndexPath *)indexPath;
+
+-(NSIndexPath*) addHost;
+-(void) moveHostAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath;
+-(void) deleteHostAtIndexPath:(NSIndexPath*)indexPath;
+
+@end
Index: trunk/Classes/Hosts/MKHostViewController.m
===================================================================
--- trunk/Classes/Hosts/MKHostViewController.m (revision 0)
+++ trunk/Classes/Hosts/MKHostViewController.m (revision 805)
@@ -0,0 +1,81 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "MKHostViewController.h"
+
+
+@implementation MKHostViewController
+
+@synthesize host=_host;
+
+#pragma mark -
+
+- (id)initWithHost:(MKHost*)theHost {
+
+ if ((self = [super initWithFile:@"MKHost"])) {
+ self.title = NSLocalizedString(@"MK Host",@"MK Host Title");
+ self.host = theHost;
+ super.dataSource = self;
+ }
+
+ return self;
+}
+
+- (void)dealloc {
+
+ self.host = nil;
+ [_host release];
+ [super dealloc];
+}
+
+#pragma mark -
+
+// called after this controller's view will appear
+- (void)viewWillAppear:(BOOL)animated
+{
+ [self.navigationController setToolbarHidden:YES animated:NO];
+}
+
+/*
+ // Override to allow orientations other than the default portrait orientation.
+ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+ // Return YES for supported orientations
+ return (interfaceOrientation == UIInterfaceOrientationPortrait);
+ }
+ */
+
+#pragma mark -
+#pragma mark InAppSettingsDatasource
+
+- (id) objectForKey:(id)aKey {
+
+ return [self.host valueForKey:aKey];
+}
+
+- (void) setObject:(id)anObject forKey:(id)aKey {
+ [self.host setValue:anObject forKey:aKey];
+}
+
+@end
+
Index: trunk/Classes/Hosts/MKHost.m
===================================================================
--- trunk/Classes/Hosts/MKHost.m (revision 0)
+++ trunk/Classes/Hosts/MKHost.m (revision 805)
@@ -0,0 +1,90 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "MKHost.h"
+
+#define kNameKey @"name"
+#define kAddressKey @"address"
+#define kPortKey @"port"
+#define kConnectionClassKey @"connectionClass"
+
+@implementation MKHost
+
+@synthesize name=_name;
+@synthesize address=_address;
+@synthesize port=_port;
+@synthesize connectionClass=_connectionClass;
+
+- (id) init
+{
+ self = [super init];
+ if (self != nil) {
+ self.name = NSLocalizedString(@"New host",@"Default host name");
+ }
+ return self;
+}
+
+- (void) dealloc
+{
+ self.name=nil;
+ self.address=nil;
+ self.connectionClass=nil;
+
+ [super dealloc];
+}
+
+-(NSString*) description {
+ return self.name;
+}
+
+#pragma mark NSCoding
+- (void)encodeWithCoder:(NSCoder *)encoder {
+ [encoder encodeObject:_name forKey:kNameKey];
+ [encoder encodeObject:_address forKey:kAddressKey];
+ [encoder encodeInteger:_port forKey:kPortKey];
+ [encoder encodeObject:_connectionClass forKey:kConnectionClassKey];
+}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super init]) {
+ self.name = [decoder decodeObjectForKey:kNameKey];
+ self.address = [decoder decodeObjectForKey:kAddressKey];
+ self.port = [decoder decodeIntegerForKey:kPortKey];
+ self.connectionClass = [decoder decodeObjectForKey:kConnectionClassKey];
+ }
+ return self;
+}
+#pragma mark -
+#pragma mark NSCopying
+- (id)copyWithZone:(NSZone *)zone {
+ MKHost *copy = [[[self class] allocWithZone: zone] init];
+ copy.name = [[self.name copyWithZone:zone] autorelease];
+ copy.address = [[self.address copyWithZone:zone] autorelease];
+ copy.port = self.port;
+ copy.connectionClass = [[self.connectionClass copyWithZone:zone] autorelease];
+
+ return copy;
+}
+
+
+@end
Index: trunk/Classes/Hosts/MKHosts.m
===================================================================
--- trunk/Classes/Hosts/MKHosts.m (revision 0)
+++ trunk/Classes/Hosts/MKHosts.m (revision 805)
@@ -0,0 +1,175 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "MKHosts.h"
+#import "MKHost.h"
+
+#import "TTGlobalCorePaths.h"
+#import "TTCorePreprocessorMacros.h"
+
+@interface MKHosts (Private)
+-(void) load;
+-(void) save;
+@end
+
+@implementation MKHosts
+
+- (id) init
+{
+ self = [super init];
+ if (self != nil) {
+ [self load];
+
+ if(!hosts) {
+ hosts = [[NSMutableArray alloc]init];
+
+ MKHost* h;
+
+ h = [[MKHost alloc]init];
+ h.name = @"Quadkopter WLAN";
+ h.address = @"192.168.0.74";
+ h.port = 23;
+ h.connectionClass = @"MKIpConnection";
+ [hosts addObject:h];
+ [h release];
+
+ h = [[MKHost alloc]init];
+ h.name = @"Quadkopter QMK";
+ h.address = @"127.0.0.1";
+ h.port = 64400;
+ h.connectionClass = @"MKQmkIpConnection";
+ [hosts addObject:h];
+ [h release];
+
+ h = [[MKHost alloc]init];
+ h.name = @"Quadkopter Fake";
+ h.address = @"192.168.0.74";
+ h.port = 23;
+ h.connectionClass = @"MKFakeConnection";
+ [hosts addObject:h];
+ [h release];
+
+
+
+ [self save];
+ }
+ }
+ return self;
+}
+
+- (void) dealloc
+{
+ [hosts release];
+ [super dealloc];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define kFilename @"mkhosts"
+#define kDataKey @"Data"
+
+-(void) load {
+
+ NSString *filePath = TTPathForDocumentsResource(kFilename);
+
+ if ([[NSFileManager defaultManager] fileExistsAtPath:filePath]) {
+
+ DLog(@"Load the hosts from %@",filePath);
+
+ NSData *data = [[NSMutableData alloc]
+ initWithContentsOfFile:filePath];
+ NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
+
+ TT_RELEASE_SAFELY(hosts);
+ hosts = [unarchiver decodeObjectForKey:kDataKey];
+ [hosts retain];
+
+ [unarchiver finishDecoding];
+
+ [unarchiver release];
+ [data release];
+
+ DLog(@"Loaded the hosts %@",hosts);
+
+ }
+}
+
+-(void) save {
+
+ NSString *filePath = TTPathForDocumentsResource(kFilename);
+ NSMutableData *data = [[NSMutableData alloc] init];
+ NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
+
+ [archiver encodeObject:hosts forKey:kDataKey];
+ [archiver finishEncoding];
+ [data writeToFile:filePath atomically:YES];
+
+ [archiver release];
+ [data release];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+-(NSUInteger) count {
+ return [hosts count];
+}
+
+-(MKHost*) hostAtIndexPath:(NSIndexPath *)indexPath {
+ NSUInteger row = [indexPath row];
+ return [hosts objectAtIndex:row];
+}
+
+-(NSIndexPath*) addHost {
+ MKHost* h = [[MKHost alloc]init];
+ h.connectionClass = @"MKFakeConnection";
+ [hosts addObject:h];
+ [h release];
+
+ [self save];
+ return [NSIndexPath indexPathForRow:[hosts count]-1 inSection:0];
+}
+
+-(void) moveHostAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+ NSLog(@"moveHostAtIndexPath %@ -> %@",fromIndexPath,toIndexPath);
+ NSLog(@"%@",hosts);
+
+ NSUInteger fromRow = [fromIndexPath row];
+ NSUInteger toRow = [toIndexPath row];
+
+ id object = [[hosts objectAtIndex:fromRow] retain];
+ [hosts removeObjectAtIndex:fromRow];
+ [hosts insertObject:object atIndex:toRow];
+ [object release];
+
+ NSLog(@"%@",hosts);
+ [self save];
+}
+
+-(void) deleteHostAtIndexPath:(NSIndexPath*)indexPath {
+ [hosts removeObjectAtIndex:[indexPath row]];
+ [self save];
+}
+
+@end
+
Index: trunk/Classes/Settings/SettingsSelectionViewController.m
===================================================================
--- trunk/Classes/Settings/SettingsSelectionViewController.m (revision 0)
+++ trunk/Classes/Settings/SettingsSelectionViewController.m (revision 805)
@@ -0,0 +1,454 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "SettingsSelectionViewController.h"
+#import "SettingViewController.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "NSData+MKPayloadEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+#import "InAppSettings.h"
+#import "MixerViewController.h"
+#import "ChannelsViewController.h"
+#import "EngineTestViewController.h"
+
+static NSUInteger kNumberOfPages = 5;
+
+@interface SettingsSelectionViewController (Private)
+
+@end
+
+// ///////////////////////////////////////////////////////////////////////////////
+
+@implementation SettingsSelectionViewController
+
+@synthesize settings=_settings;
+
+// ///////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark View lifecycle
+
+
+- (id)init {
+
+ if ((self = [super initWithStyle:UITableViewStyleGrouped])) {
+ self.title = NSLocalizedString(@"Settings",@"Settings controller title");
+ self.hidesBottomBarWhenPushed=NO;
+ }
+
+ return self;
+}
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(readSettingNotification:)
+ name:MKReadSettingNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(changeSettingNotification:)
+ name:MKChangeSettingNotification
+ object:nil];
+
+
+ [self.tableView setAllowsSelectionDuringEditing:YES];
+
+}
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)didReceiveMemoryWarning {
+ // Releases the view if it doesn't have a superview.
+ [super didReceiveMemoryWarning];
+
+ // Relinquish ownership any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+
+ self.settings=nil;
+ [_settings release];
+}
+
+
+- (void)dealloc {
+ [super dealloc];
+ [_settings release];
+}
+
+// ////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+- (void) viewWillAppear:(BOOL)animated {
+ [self.navigationController setToolbarHidden:NO animated:NO];
+ [[MKConnectionController sharedMKConnectionController] activateFlightCtrl];
+}
+
+- (void) viewDidAppear:(BOOL)animated {
+ [self cancelEditActiveSetting:self];
+ [self reloadAllSettings];
+
+ UIBarButtonItem* actionButton;
+
+ actionButton = [[[UIBarButtonItem alloc]
+ initWithTitle:@"Change Active"
+ style:UIBarButtonItemStyleBordered|UIBarButtonItemStyleDone
+ target:self
+ action:@selector(saveActiveSetting:)] autorelease];
+
+
+ [self setToolbarItems:[NSArray arrayWithObject:actionButton] animated:YES];
+ //[actionButton release];
+}
+
+// ////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+
+- (IBAction) reloadAllSettings {
+
+ NSMutableArray * settings = [[NSMutableArray alloc] init];
+ for (unsigned i = 0; i < kNumberOfPages; i++) {
+ [settings addObject:[NSNull null]];
+ }
+ self.settings = settings;
+ [settings release];
+
+ activeSetting=0xFF;
+ [self requestSettingForIndex:0xFF];
+
+}
+
+
+// theIndex 1-5 or 0xFF
+- (void) requestSettingForIndex:(NSInteger)theIndex {
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t index = theIndex;
+
+ NSData * data = [NSData dataWithCommand:MKCommandReadSettingsRequest
+ forAddress:MKAddressFC
+ payloadWithBytes:&index
+ length:1];
+
+ [cCtrl sendRequest:data];
+}
+
+
+- (void) readSettingNotification:(NSNotification *)aNotification {
+
+ NSDictionary* d=[aNotification userInfo];
+
+ NSInteger index = [[d objectForKey:kMKDataKeyIndex] integerValue]-1;
+
+ if (activeSetting==0xFF) {
+ activeSetting=index;
+ }
+
+ [self.settings replaceObjectAtIndex:index withObject:d];
+
+ for (int i=0; i<kNumberOfPages; i++) {
+ if ([self.settings objectAtIndex:i] == [NSNull null]) {
+ [self requestSettingForIndex:i+1];
+ break;
+ }
+ }
+ [self.tableView reloadData];
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+ return self.tableView.editing?1:2;
+}
+
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+ if(section==0)
+ return [self.settings count];
+
+ return 3;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+- (UITableViewCell *) cellForSetting: (UITableView *) tableView indexPath: (NSIndexPath *) indexPath {
+ static NSString *CellIdentifier = @"SettingsSelectionCell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ NSUInteger row = [indexPath row];
+ NSDictionary* setting=[self.settings objectAtIndex:row];
+
+ if ((NSNull *)setting == [NSNull null]) {
+ cell.textLabel.text = [NSString stringWithFormat:NSLocalizedString(@"Setting #%d",@"Setting i"), row];
+
+ UIActivityIndicatorView *activityView =
+ [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
+ [activityView startAnimating];
+ [cell setAccessoryView:activityView];
+ [activityView release];
+ }
+ else {
+
+ cell.textLabel.text = [setting objectForKey:kKeyName];
+ cell.accessoryView = nil;
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ }
+
+
+ int currActiveSetting= self.tableView.editing? newActiveSetting:activeSetting;
+
+ if( row == currActiveSetting ){
+ UIImage *image = [UIImage imageNamed:@"star.png"];
+ cell.imageView.image = image;
+ }
+ else {
+ cell.imageView.image = nil;
+ }
+
+
+ return cell;
+
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+- (UITableViewCell *) cellForExtra: (UITableView *) tableView indexPath: (NSIndexPath *) indexPath {
+ static NSString *CellIdentifier = @"SettingsMixerCell";
+
+ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
+ if (cell == nil) {
+ cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
+ }
+
+ switch (indexPath.row) {
+ case 0:
+ cell.textLabel.text = NSLocalizedString(@"Mixer",@"Mixer cell");
+ break;
+ case 1:
+ cell.textLabel.text = NSLocalizedString(@"Motor test",@"Motor test cell");
+ break;
+ case 2:
+ cell.textLabel.text = NSLocalizedString(@"Channels",@"Channels cell");
+ break;
+ }
+ cell.accessoryView = nil;
+ cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
+ cell.imageView.image = nil;
+
+
+ return cell;
+
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ if(indexPath.section==0)
+ return [self cellForSetting: tableView indexPath: indexPath];
+
+ return [self cellForExtra: tableView indexPath: indexPath];
+}
+
+- (UITableViewCellEditingStyle)tableView:(UITableView *)tableView editingStyleForRowAtIndexPath:(NSIndexPath *)indexPath {
+ return UITableViewCellEditingStyleNone;
+}
+
+- (BOOL)tableView:(UITableView *)tableView shouldIndentWhileEditingRowAtIndexPath:(NSIndexPath *)indexPath
+{
+ return NO;
+}
+
+// Override to support conditional editing of the table view.
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+ return indexPath.section==0;
+}
+
+
+/*
+// 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
+ [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:YES];
+ }
+ 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;
+}
+*/
+
+- (void) changeSettingNotification:(NSNotification *)aNotification {
+
+ NSDictionary* d=[aNotification userInfo];
+
+ NSInteger index = [[d objectForKey:kMKDataKeyIndex] integerValue]-1;
+
+ activeSetting=index;
+
+ [self cancelEditActiveSetting:self];
+}
+
+- (void)saveActiveSetting:(id)sender
+{
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+ uint8_t index = newActiveSetting+1;
+
+ NSData * data = [NSData dataWithCommand:MKCommandChangeSettingsRequest
+ forAddress:MKAddressFC
+ payloadWithBytes:&index
+ length:1];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void)editActiveSetting:(id)sender
+{
+ [self.navigationController setToolbarHidden:NO animated:YES];
+
+ UIBarButtonItem *cancelButton = [[[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
+ target:self
+ action:@selector(cancelEditActiveSetting:)]autorelease];
+
+ [self.navigationItem setRightBarButtonItem:cancelButton animated:NO];
+
+ newActiveSetting = activeSetting;
+
+ [self.tableView setEditing:YES animated:YES];
+ [self.tableView deleteSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationFade];
+}
+
+- (void)cancelEditActiveSetting:(id)sender
+{
+ [self.navigationController setToolbarHidden:YES animated:YES];
+
+ UIBarButtonItem *editButton = [[[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemEdit
+ target:self
+ action:@selector(editActiveSetting:)]autorelease];
+
+ [self.navigationItem setRightBarButtonItem:editButton animated:NO];
+ [self.tableView setEditing:NO animated:YES];
+
+ //[self.tableView insertSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:YES];
+
+ [self.tableView reloadData];
+}
+
+
+#pragma mark -
+#pragma mark Table view delegate
+
+- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+ if( self.tableView.editing && indexPath.section!=0 )
+ return nil;
+ return indexPath;
+}
+
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+
+ [tableView deselectRowAtIndexPath:indexPath animated:YES];
+
+ NSUInteger row = [indexPath row];
+
+ if (self.tableView.editing ) {
+
+ if(indexPath.section==0 && newActiveSetting != row) {
+ NSArray *row0 = [NSArray arrayWithObject:[NSIndexPath indexPathForRow:newActiveSetting inSection:0]];
+ newActiveSetting = row;
+ NSArray *row1 = [NSArray arrayWithObject:[NSIndexPath indexPathForRow:newActiveSetting inSection:0]];
+
+ [self.tableView beginUpdates];
+ [self.tableView reloadRowsAtIndexPaths:row0 withRowAnimation:UITableViewRowAnimationFade];
+ [self.tableView reloadRowsAtIndexPaths:row1 withRowAnimation:UITableViewRowAnimationFade];
+ [self.tableView endUpdates];
+ }
+ }
+ else {
+ if( indexPath.section==0 ) {
+ NSMutableDictionary* setting=[self.settings objectAtIndex:row];
+ SettingViewController* settingView = [[SettingViewController alloc] initWithSettingDatasource:setting];
+
+ [self.navigationController setToolbarHidden:NO animated:NO];
+
+ [self.navigationController pushViewController:settingView animated:YES];
+ [settingView release];
+ }
+ else {
+ MixerViewController* extraView=nil;
+
+ switch (indexPath.row) {
+ case 0:
+ extraView = [[MixerViewController alloc] initWithStyle:UITableViewStylePlain];
+ break;
+ case 1:
+ extraView = [[EngineTestViewController alloc] initWithStyle:UITableViewStyleGrouped];
+ break;
+ case 2:
+ extraView = [[ChannelsViewController alloc] initWithStyle:UITableViewStylePlain];
+ break;
+ }
+
+ [self.navigationController setToolbarHidden:NO animated:NO];
+
+ [self.navigationController pushViewController:extraView animated:YES];
+ [extraView release];
+ }
+ }
+}
+
+
+
+
+@end
+
Index: trunk/Classes/Settings/SettingViewController.h
===================================================================
--- trunk/Classes/Settings/SettingViewController.h (revision 0)
+++ trunk/Classes/Settings/SettingViewController.h (revision 805)
@@ -0,0 +1,40 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+#import "InAppSettings.h"
+
+@interface SettingViewController : InAppSettingsViewController<InAppSettingsDatasource> {
+
+ NSMutableDictionary* _setting;
+}
+
+@property(nonatomic,retain) NSMutableDictionary* setting;
+
+- (id)initWithSettingDatasource:(NSMutableDictionary*)aSetting;
+
+- (void)saveSetting:(id)sender;
+- (void)reloadSetting:(id)sender;
+
+@end
Index: trunk/Classes/Settings/SettingViewController.m
===================================================================
--- trunk/Classes/Settings/SettingViewController.m (revision 0)
+++ trunk/Classes/Settings/SettingViewController.m (revision 805)
@@ -0,0 +1,183 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "SettingViewController.h"
+#import "InAppSettings.h"
+#import "MKConnectionController.h"
+#import "NSData+MKCommandEncode.h"
+#import "NSData+MKPayloadEncode.h"
+#import "MKDatatypes.h"
+#import "MKDataConstants.h"
+
+@implementation SettingViewController
+
+@synthesize setting=_setting;
+
+#pragma mark -
+
+- (id)initWithSettingDatasource:(NSMutableDictionary*)aSetting {
+
+ if ((self = [super initWithFile:@"Setting"])) {
+ self.setting = aSetting;
+ super.dataSource = self;
+ }
+
+ return self;
+}
+
+- (void)dealloc {
+
+ self.setting=nil;
+ [_setting release];
+ [super dealloc];
+}
+
+#pragma mark -
+#pragma mark View lifecycle
+
+- (void)viewDidLoad {
+ [super viewDidLoad];
+
+ UIBarButtonItem* renameButton;
+ renameButton = [[[UIBarButtonItem alloc]
+ initWithTitle:NSLocalizedString(@"Save",@"Save toolbar item")
+ style:UIBarButtonItemStyleDone
+ target:self
+ action:@selector(saveSetting:)] autorelease];
+
+
+ UIBarButtonItem* spacer;
+ spacer = [[[UIBarButtonItem alloc]
+ initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace
+ target:nil
+ action:nil] autorelease];
+
+ UIBarButtonItem* reloadButton;
+ reloadButton = [[[UIBarButtonItem alloc]
+ initWithTitle:NSLocalizedString(@"Reload", @"Reload toolbar item")
+ style:UIBarButtonItemStyleBordered
+ target:self
+ action:@selector(reloadSetting:)] autorelease];
+
+ [self setToolbarItems:[NSArray arrayWithObjects:renameButton,spacer,reloadButton,nil]];
+}
+
+- (void)viewDidUnload {
+ [super viewDidUnload];
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+ DLog(@"unload");
+}
+
+#pragma mark -
+
+// called after this controller's view will appear
+- (void)viewWillAppear:(BOOL)animated
+{
+ [self.navigationController setToolbarHidden:NO animated:NO];
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc addObserver:self
+ selector:@selector(readSettingNotification:)
+ name:MKReadSettingNotification
+ object:nil];
+
+ [nc addObserver:self
+ selector:@selector(writeSettingNotification:)
+ name:MKWriteSettingNotification
+ object:nil];
+}
+
+// called after this controller's view will appear
+- (void)viewWillDisappear:(BOOL)animated {
+
+ NSNotificationCenter * nc = [NSNotificationCenter defaultCenter];
+ [nc removeObserver:self];
+}
+
+
+#pragma mark -
+#pragma mark Save Setting
+
+- (void)saveSetting:(id)sender {
+
+ DLog(@"save setting");
+
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+
+ NSData * payload = [NSData payloadForWriteSettingRequest:self.setting];
+
+ NSData * data = [payload dataWithCommand:MKCommandWriteSettingsRequest
+ forAddress:MKAddressFC];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) writeSettingNotification:(NSNotification *)aNotification {
+
+ UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Setting" message:@"Setting saved"
+ delegate:self cancelButtonTitle:@"OK" otherButtonTitles: nil];
+ [alert show];
+ [alert release];
+}
+
+#pragma mark -
+#pragma mark Reload Setting
+
+- (void)reloadSetting:(id)sender {
+
+ MKConnectionController * cCtrl = [MKConnectionController sharedMKConnectionController];
+
+ NSNumber* theIndex = [self.setting objectForKey:kMKDataKeyIndex];
+ uint8_t index = [theIndex unsignedCharValue];
+
+ NSData * data = [NSData dataWithCommand:MKCommandReadSettingsRequest
+ forAddress:MKAddressFC
+ payloadWithBytes:&index
+ length:1];
+
+ [cCtrl sendRequest:data];
+}
+
+- (void) readSettingNotification:(NSNotification *)aNotification {
+
+ NSDictionary* d=[aNotification userInfo];
+ self.setting = [d mutableCopy];
+ [super.settingsTableView reloadData];
+}
+
+#pragma mark -
+#pragma mark InAppSettingsDatasource
+
+- (id) objectForKey:(id)aKey {
+ return [self.setting objectForKey:aKey];
+}
+
+- (void) setObject:(id)anObject forKey:(id)aKey {
+ [self.setting setObject:anObject forKey:aKey];
+}
+
+
+@end
Index: trunk/Classes/Settings/SettingsSelectionViewController.h
===================================================================
--- trunk/Classes/Settings/SettingsSelectionViewController.h (revision 0)
+++ trunk/Classes/Settings/SettingsSelectionViewController.h (revision 805)
@@ -0,0 +1,46 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <UIKit/UIKit.h>
+
+
+@interface SettingsSelectionViewController : UITableViewController {
+
+ NSMutableArray* _settings;
+ int activeSetting;
+ int newActiveSetting;
+}
+
+@property (nonatomic, retain) NSMutableArray* settings;
+
+- (void) requestSettingForIndex:(NSInteger)theIndex;
+
+- (IBAction) reloadAllSettings;
+
+
+- (void)saveActiveSetting:(id)sender;
+- (void)editActiveSetting:(id)sender;
+- (void)cancelEditActiveSetting:(id)sender;
+
+@end
Index: trunk/Classes/iKopterAppDelegate.m
===================================================================
--- trunk/Classes/iKopterAppDelegate.m (revision 0)
+++ trunk/Classes/iKopterAppDelegate.m (revision 805)
@@ -0,0 +1,93 @@
+//
+// iKopterAppDelegate.m
+// iKopter
+//
+// Created by Frank Blumenberg on 20.06.10.
+// Copyright de.frankblumenberg 2010. All rights reserved.
+//
+
+#import "iKopterAppDelegate.h"
+#import "RootViewController.h"
+#import "MKConnectionController.h"
+
+
+@implementation iKopterAppDelegate
+
+@synthesize window;
+@synthesize navigationController;
+
+
+#pragma mark -
+#pragma mark Application lifecycle
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+ // Override point for customization after application launch.
+
+ // Add the navigation controller's view to the window and display.
+ [window addSubview:navigationController.view];
+ [window makeKeyAndVisible];
+
+ return YES;
+}
+
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+ /*
+ 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.
+ */
+}
+
+
+- (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, called instead of applicationWillTerminate: when the user quits.
+ */
+ [[MKConnectionController sharedMKConnectionController] stop];
+ [self.navigationController popToRootViewControllerAnimated:NO];
+}
+
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+ /*
+ Called as part of 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 {
+ /*
+ 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.
+ */
+}
+
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+ /*
+ Called when the application is about to terminate.
+ See also applicationDidEnterBackground:.
+ */
+}
+
+
+#pragma mark -
+#pragma mark Memory management
+
+- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
+ /*
+ Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
+ */
+}
+
+
+- (void)dealloc {
+ [navigationController release];
+ [window release];
+ [super dealloc];
+}
+
+
+@end
+
Index: trunk/Classes/Communication/MKIpConnection.h
===================================================================
--- trunk/Classes/Communication/MKIpConnection.h (revision 0)
+++ trunk/Classes/Communication/MKIpConnection.h (revision 805)
@@ -0,0 +1,37 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "MKConnection.h"
+
+@class AsyncSocket;
+
+@interface MKIpConnection : NSObject<MKConnection> {
+
+ AsyncSocket * asyncSocket;
+
+ id<MKConnectionDelegate> delegate;
+}
+
+@end
Index: trunk/Classes/Communication/NSData+MKCommandDecode.h
===================================================================
--- trunk/Classes/Communication/NSData+MKCommandDecode.h (revision 0)
+++ trunk/Classes/Communication/NSData+MKCommandDecode.h (revision 805)
@@ -0,0 +1,38 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+
+#import "MKDatatypes.h"
+
+@interface NSData (MKCommandDecode)
+
+- (BOOL) isMkData;
+- (BOOL) isCrcOk;
+- (MKAddress) address;
+- (MKCommandId) command;
+
+- (NSData *) payload;
+
+@end
Index: trunk/Classes/Communication/MKFakeConnection.m
===================================================================
--- trunk/Classes/Communication/MKFakeConnection.m (revision 0)
+++ trunk/Classes/Communication/MKFakeConnection.m (revision 805)
@@ -0,0 +1,347 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+
+#import "MKFakeConnection.h"
+#import "NSData+MKCommandDecode.h"
+#import "NSData+MKCommandEncode.h"
+#import "NSData+MKPayloadDecode.h"
+#import "NSData+MKPayloadEncode.h"
+
+#import "MKDataConstants.h"
+
+static NSString * const MKDummyConnectionException = @"MKDummyConnectionException";
+
+@interface MKFakeConnection (Private)
+
+- (void) doConnect;
+- (void) doDisconnect;
+- (void) doResponseMkData:(NSData*)data;
+
+@end
+
+@implementation MKFakeConnection
+
+#pragma mark Properties
+
+@synthesize delegate;
+
+#pragma mark Initialization
+
+- (id) init {
+ return [self initWithDelegate:nil];
+}
+
+- (id) initWithDelegate:(id)theDelegate;
+{
+ if (self = [super init]) {
+ self.delegate = theDelegate;
+
+ NSString *path = [[NSBundle mainBundle] pathForResource:@"AllSettings"
+ ofType:@"plist"];
+
+ settings = [[NSMutableArray arrayWithContentsOfFile:path] retain];
+
+ activeSetting = 3;
+ }
+ return self;
+}
+
+- (void) dealloc {
+ [settings release];
+ [super dealloc];
+}
+
+#pragma mark -
+#pragma mark MKInput
+
+- (BOOL) connectTo:(NSString *)hostOrDevice error:(NSError **)err;
+{
+ if (delegate == nil) {
+ [NSException raise:MKDummyConnectionException
+ format:@"Attempting to connect without a delegate. Set a delegate first."];
+ }
+
+ NSArray * hostItems = [hostOrDevice componentsSeparatedByString:@":"];
+ if ( [hostItems count] != 2 ) {
+ [NSException raise:MKDummyConnectionException
+ format:@"Attempting to connect without a port. Set a port first."];
+
+ }
+
+ int port = [[hostItems objectAtIndex:1] intValue];
+ NSString * host = [hostItems objectAtIndex:0];
+
+ DLog(@"Try to connect to %@ on port %d", host, port);
+
+ [self performSelector:@selector(doConnect) withObject:nil afterDelay:0.5];
+ return YES;
+}
+
+- (BOOL) isConnected;
+{
+ return isConnected;
+}
+
+- (void) disconnect;
+{
+ [self performSelector:@selector(doDisconnect) withObject:nil afterDelay:0.1];
+}
+
+- (void) writeMkData:(NSData *)data;
+{
+ [self performSelector:@selector(doResponseMkData:) withObject:[data retain] afterDelay:0.1];
+}
+
+#pragma mark -
+
+
+- (NSData*) versionResponse;
+{
+ VersionInfo v;
+ v.SWMajor = 0;
+ v.SWMinor = 78;
+ v.ProtoMajor = 3;
+ v.ProtoMinor = 1;
+ v.SWPatch = 3;
+ NSData * payload = [NSData dataWithBytes:(void*)&v length:sizeof(v)];
+ return payload;
+}
+
+- (NSData*) debugResponse;
+{
+ DebugOut d;
+ NSData * payload = [NSData dataWithBytes:(void*)&d length:sizeof(d)];
+ return payload;
+}
+
+- (NSData*) channelResponse;
+{
+ int16_t data[26];
+
+ for (int i=0; i<26; i++) {
+ data[i]=random()%250;
+ }
+
+ NSData * payload = [NSData dataWithBytes:(void*)&data length:sizeof(data)];
+ return payload;
+}
+
+
+
+- (NSData*) menuResponse:(NSData*)payload {
+
+ const char * bytes = [payload bytes];
+
+ uint8_t key=(uint8_t)bytes[0];
+// uint8_t interval=(uint8_t)bytes[1];
+
+ if (key==0xFD) {
+ menuPage++;
+ } else if (key==0xFE) {
+ menuPage--;
+ }
+
+ menuPage %= 16;
+ menuCounter = 1;
+
+ NSString* screen=[NSString stringWithFormat:@"Page %02d (%d)---------12345678901234567890abcdefghijklmnopqrst++++++++++++++++++++",
+ menuPage,menuCounter];
+
+ NSData * newPayload = [screen dataUsingEncoding:NSASCIIStringEncoding];
+
+ [self performSelector:@selector(resendMenuResponse) withObject:nil afterDelay:0.5];
+
+ return newPayload;
+}
+
+- (void) resendMenuResponse {
+
+ NSString* screen=[NSString stringWithFormat:@"Page %02d (%d)---------12345678901234567890abcdefghijklmnopqrst++++++++++++++++++++",
+ menuPage,menuCounter];
+
+ NSData * newPayload = [screen dataUsingEncoding:NSASCIIStringEncoding];
+
+ NSData * rspData = [newPayload dataWithCommand:MKCommandLcdResponse forAddress:MKAddressFC];
+
+ if ( [delegate respondsToSelector:@selector(didReadMkData:)] ) {
+ [delegate didReadMkData:rspData];
+ }
+
+ if ( (++menuCounter)<2 ) {
+ [self performSelector:@selector(resendMenuResponse) withObject:nil afterDelay:0.5];
+ }
+}
+
+
+
+- (NSData*) changeSettingsResponse:(NSData*)payload {
+
+ const char * bytes = [payload bytes];
+
+ uint8_t index=(uint8_t)bytes[0];
+
+ activeSetting = index;
+
+ NSData * newPayload = [NSData dataWithBytes:(void*)&index length:sizeof(index)];
+ return newPayload;
+
+}
+
+- (NSData*) writeSettingResponse:(NSData*)payload {
+
+ NSDictionary* d = [payload decodeReadSettingResponse];
+
+ NSNumber* theIndex = [d objectForKey:kMKDataKeyIndex];
+ uint8_t index = [theIndex unsignedCharValue];
+
+ [settings replaceObjectAtIndex:index-1 withObject:d];
+
+ NSData * newPayload = [NSData dataWithBytes:(void*)&index length:sizeof(index)];
+ return newPayload;
+}
+
+- (NSData*) readSettingResponse:(NSData*)payload {
+
+ const char * bytes = [payload bytes];
+
+ uint8_t index=(uint8_t)bytes[0];
+
+ if (index==0xFF) {
+ index=activeSetting;
+ }
+
+ index--;
+
+ NSDictionary* d = [settings objectAtIndex:index];
+
+ DLog(@"%@",d);
+
+ NSData * newPayload = [NSData payloadForWriteSettingRequest:d];
+
+ return newPayload;
+}
+
+#pragma mark -
+
+- (void) doConnect {
+
+ isConnected=YES;
+ if ( [delegate respondsToSelector:@selector(didConnectTo:)] ) {
+ [delegate didConnectTo:@"Dummy"];
+ }
+
+ NSData * data = [NSData dataWithCommand:MKCommandVersionRequest
+ forAddress:MKAddressAll
+ payloadWithBytes:NULL
+ length:0];
+
+ [self writeMkData:data];
+}
+
+
+- (void) doDisconnect {
+ isConnected=NO;
+ if ( [delegate respondsToSelector:@selector(didDisconnect)] ) {
+ [delegate didDisconnect];
+ }
+}
+
+- (void) doResponseMkData:(NSData*)data {
+
+ if ([data isCrcOk]) {
+
+ NSData * payload = [data payload];
+// MKAddress address = [data address];
+
+ NSData * rspPayload;
+ MKCommandId rspCommand;
+
+ DLog(@"Need responde for command %c",[data command]);
+
+ switch ([data command]) {
+/*
+ case MKCommandLcdMenuResponse:
+ n = MKLcdMenuNotification;
+ d = [payload decodeLcdMenuResponse];
+ break;
+ case MKCommandLcdResponse:
+ n = MKLcdNotification;
+ d = [payload decodeLcdResponse];
+ break;
+ case MKCommandDebugLabelResponse:
+ n = MKDebugLabelNotification;
+ d = [payload decodeAnalogLabelResponse];
+ break;
+*/
+ case MKCommandLcdRequest:
+ rspPayload = [self menuResponse:payload];
+ rspCommand = MKCommandLcdResponse;
+ break;
+ case MKCommandDebugValueRequest:
+ rspPayload = [self debugResponse];
+ rspCommand = MKCommandDebugValueResponse;
+ break;
+ case MKCommandChannelsValueRequest:
+ rspPayload = [self channelResponse];
+ rspCommand = MKCommandChannelsValueResponse;
+ break;
+ case MKCommandVersionRequest:
+ rspPayload = [self versionResponse];
+ rspCommand = MKCommandVersionResponse;
+ break;
+ case MKCommandChangeSettingsRequest:
+ rspPayload = [self changeSettingsResponse:payload];
+ rspCommand = MKCommandChangeSettingsResponse;
+ break;
+ case MKCommandReadSettingsRequest:
+ rspPayload = [self readSettingResponse:payload];
+ rspCommand = MKCommandReadSettingsResponse;
+ break;
+ case MKCommandWriteSettingsRequest:
+ rspPayload = [self writeSettingResponse:payload];
+ rspCommand = MKCommandWriteSettingsResponse;
+ break;
+ case MKCommandEngineTestRequest:
+ DLog(@"Engine Test %@",payload);
+ [data release];
+ return;
+ default:
+ ALog(@"Unknown command %c",[data command]);
+ [data release];
+ return;
+ }
+
+ NSData * rspData = [rspPayload dataWithCommand:rspCommand forAddress:MKAddressFC];
+
+ if ( [delegate respondsToSelector:@selector(didReadMkData:)] ) {
+ [delegate didReadMkData:rspData];
+ }
+
+ }
+
+ [data release];
+}
+
+@end
Index: trunk/Classes/Communication/MKIpConnection.m
===================================================================
--- trunk/Classes/Communication/MKIpConnection.m (revision 0)
+++ trunk/Classes/Communication/MKIpConnection.m (revision 805)
@@ -0,0 +1,160 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+
+#import "MKIpConnection.h"
+#import "AsyncSocket.h"
+
+static NSString * const MKIpConnectionException = @"MKIpConnectionException";
+
+@implementation MKIpConnection
+
+#pragma mark Properties
+
+@synthesize delegate;
+
+#pragma mark Initialization
+
+- (id) init {
+ return [self initWithDelegate:nil];
+}
+
+- (id) initWithDelegate:(id<MKConnectionDelegate>)theDelegate;
+{
+ if (self = [super init]) {
+
+ asyncSocket = [[AsyncSocket alloc] init];
+ [asyncSocket setDelegate:self];
+
+ self.delegate = theDelegate;
+ }
+ return self;
+}
+
+- (void) dealloc {
+ DLog("dealloc");
+ [asyncSocket release];
+ [super dealloc];
+}
+
+#pragma mark -
+#pragma mark MKInput
+
+- (BOOL) connectTo:(NSString *)hostOrDevice error:(NSError **)err;
+{
+ if (delegate == nil) {
+ [NSException raise:MKIpConnectionException
+ format:@"Attempting to connect without a delegate. Set a delegate first."];
+ }
+
+ NSArray * hostItems = [hostOrDevice componentsSeparatedByString:@":"];
+ if ( [hostItems count] != 2 ) {
+ [NSException raise:MKIpConnectionException
+ format:@"Attempting to connect without a port. Set a port first."];
+ }
+
+ int port = [[hostItems objectAtIndex:1] intValue];
+ NSString * host = [hostItems objectAtIndex:0];
+
+ DLog(@"Try to connect to %@ on port %d", host, port);
+ return [asyncSocket connectToHost:host onPort:port withTimeout:30 error:err];
+}
+
+- (BOOL) isConnected;
+{
+ return [asyncSocket isConnected];
+}
+
+- (void) disconnect;
+{
+ DLog(@"Try to disconnect from %@ on port %d", [asyncSocket connectedHost], [asyncSocket connectedPort]);
+ [asyncSocket disconnect];
+}
+
+- (void) writeMkData:(NSData *)data;
+{
+// NSMutableData * newData = [data mutableCopy];
+//
+// [newData appendBytes:"\n" length:1];
+
+ [asyncSocket writeData:data withTimeout:-1 tag:0];
+
+// [newData release];
+}
+
+#pragma mark -
+#pragma mark AsyncSocketDelegate
+
+- (BOOL) onSocketWillConnect:(AsyncSocket *)sock {
+ DLog(@"About to connect to %S", [sock connectedHost]);
+ return TRUE;
+}
+
+- (void) onSocket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UInt16)port;
+{
+ DLog(@"Did connect to %@ on port %d", host, port);
+
+ if ( [delegate respondsToSelector:@selector(didConnectTo:)] ) {
+ [delegate didConnectTo:host];
+ }
+
+
+ DLog(@"Start reading the first data frame");
+ [sock readDataToData:[AsyncSocket CRData] withTimeout:-1 tag:0];
+}
+
+- (void) onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag;
+{
+ if ( [delegate respondsToSelector:@selector(didReadMkData:)] ) {
+ [delegate didReadMkData:data];
+ }
+// DLog(@"Did read data %@",data);
+//
+// DLog(@"Start reading the next data frame");
+ [sock readDataToData:[AsyncSocket CRData] withTimeout:-1 tag:0];
+}
+
+- (void) onSocket:(AsyncSocket *)sock didWriteDataWithTag:(long)tag;
+{
+ DLog(@"Finished writing the next data frame");
+}
+
+- (void) onSocket:(AsyncSocket *)sock willDisconnectWithError:(NSError *)err;
+{
+ ALog(@"Disconnet with an error %@", err);
+ if ( [delegate respondsToSelector:@selector(willDisconnectWithError:)] ) {
+ [delegate willDisconnectWithError:err];
+ }
+}
+
+- (void) onSocketDidDisconnect:(AsyncSocket *)sock;
+{
+ DLog(@"Disconnect from %@ on port %d", [asyncSocket connectedHost], [asyncSocket connectedPort]);
+
+ if ( [delegate respondsToSelector:@selector(didDisconnect)] ) {
+ [delegate didDisconnect];
+ }
+}
+
+@end
Index: trunk/Classes/Communication/NSData+MKCommandDecode.m
===================================================================
--- trunk/Classes/Communication/NSData+MKCommandDecode.m (revision 0)
+++ trunk/Classes/Communication/NSData+MKCommandDecode.m (revision 805)
@@ -0,0 +1,160 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import "NSData+MKCommandDecode.h"
+
+#define kInvalidMKCommand @"Invalid MK command"
+
+// ///////////////////////////////////////////////////////////////////////////////
+#pragma mark Helper funktions
+
+static NSData * decode64(const char * inBuffer, int length)
+{
+ unsigned char a, b, c, d;
+ unsigned char x, y, z;
+
+ int srcIdx = 0;
+ int dstIdx = 0;
+
+ NSMutableData * outData = [NSMutableData dataWithLength:length];
+ unsigned char * outBuffer = [outData mutableBytes];
+
+ if (inBuffer[srcIdx] != 0)
+ {
+ while (length != 0)
+ {
+ a = inBuffer[srcIdx++] - '=';
+ b = inBuffer[srcIdx++] - '=';
+ c = inBuffer[srcIdx++] - '=';
+ d = inBuffer[srcIdx++] - '=';
+
+ x = (a << 2) | (b >> 4);
+ y = ((b & 0x0f) << 4) | (c >> 2);
+ z = ((c & 0x03) << 6) | d;
+
+ if (length--) outBuffer[dstIdx++] = x; else break;
+ if (length--) outBuffer[dstIdx++] = y; else break;
+ if (length--) outBuffer[dstIdx++] = z; else break;
+ }
+ }
+
+ [outData setLength:dstIdx];
+ return outData;
+}
+
+// ///////////////////////////////////////////////////////////////////////////////
+@implementation NSData (MKCommandDecode)
+
+- (NSUInteger) frameLength;
+{
+ NSUInteger frameLength = [self length];
+ const char * frameBytes = [self bytes];
+
+ if (frameLength > 0 && frameBytes[frameLength - 1] == '\r')
+ frameLength--;
+
+ return frameLength;
+}
+
+
+- (BOOL) isMkData
+{
+ NSUInteger frameLength = [self frameLength];
+ const char * frameBytes = [self bytes];
+
+ if ( frameLength < 5)
+ {
+ NSLog(@"The frame length is to short %d. Frame is invalid", frameLength);
+ return NO;
+ }
+
+ if (frameBytes[0] != '#')
+ {
+ NSLog(@"The frame is no MK frame");
+ return NO;
+ }
+
+ return YES;
+}
+
+
+- (BOOL) isCrcOk
+{
+
+ if (![self isMkData])
+ return NO;
+
+ NSUInteger frameLength = [self frameLength];
+ const uint8_t * frameBytes = [self bytes];
+
+ uint8_t crc2 = frameBytes[frameLength - 1];
+ uint8_t crc1 = frameBytes[frameLength - 2];
+
+ int crc = 0;
+ for (int i = 0; i < frameLength - 2; i++)
+ {
+ crc += frameBytes[i];
+ }
+
+ crc %= 4096;
+
+ if (crc1 == ('=' + (crc / 64)) && crc2 == ('=' + crc % 64))
+ return YES;
+
+ return NO;
+}
+
+- (MKAddress) address
+{
+ if (![self isCrcOk])
+ [NSException raise:kInvalidMKCommand format:@"cannot get the address from a invalid MK frame"];
+
+ const char * frameBytes = [self bytes];
+
+ return (MKAddress)(frameBytes[1] - 'a');
+}
+
+- (MKCommandId) command
+{
+ if (![self isCrcOk])
+ [NSException raise:kInvalidMKCommand format:@"cannot get the address from a invalid MK frame"];
+
+ const char * frameBytes = [self bytes];
+ return frameBytes[2];
+}
+
+
+- (NSData *) payload;
+{
+ NSUInteger frameLength = [self frameLength];
+ const char * frameBytes = [self bytes];
+
+ int startIndex = 3;
+ int frameDataLength = frameLength - startIndex - 2;
+
+ return decode64(frameBytes + startIndex, frameDataLength);
+}
+
+
+@end
Index: trunk/Classes/Communication/AsyncSocket.h
===================================================================
--- trunk/Classes/Communication/AsyncSocket.h (revision 0)
+++ trunk/Classes/Communication/AsyncSocket.h (revision 805)
@@ -0,0 +1,511 @@
+//
+// AsyncSocket.h
+//
+// This class is in the public domain.
+// Originally created by Dustin Voss on Wed Jan 29 2003.
+// Updated and maintained by Deusty Designs and the Mac development community.
+//
+// http://code.google.com/p/cocoaasyncsocket/
+//
+
+#import <Foundation/Foundation.h>
+
+@class AsyncSocket;
+@class AsyncReadPacket;
+@class AsyncWritePacket;
+
+extern NSString *const AsyncSocketException;
+extern NSString *const AsyncSocketErrorDomain;
+
+enum AsyncSocketError
+{
+ AsyncSocketCFSocketError = kCFSocketError, // From CFSocketError enum.
+ AsyncSocketNoError = 0, // Never used.
+ AsyncSocketCanceledError, // onSocketWillConnect: returned NO.
+ AsyncSocketConnectTimeoutError,
+ AsyncSocketReadMaxedOutError, // Reached set maxLength without completing
+ AsyncSocketReadTimeoutError,
+ AsyncSocketWriteTimeoutError
+};
+typedef enum AsyncSocketError AsyncSocketError;
+
+@interface NSObject (AsyncSocketDelegate)
+
+/**
+ * In the event of an error, the socket is closed.
+ * You may call "unreadData" during this call-back to get the last bit of data off the socket.
+ * When connecting, this delegate method may be called
+ * before"onSocket:didAcceptNewSocket:" or "onSocket:didConnectToHost:".
+**/
+- (void)onSocket:(AsyncSocket *)sock willDisconnectWithError:(NSError *)err;
+
+/**
+ * Called when a socket disconnects with or without error. If you want to release a socket after it disconnects,
+ * do so here. It is not safe to do that during "onSocket:willDisconnectWithError:".
+ *
+ * If you call the disconnect method, and the socket wasn't already disconnected,
+ * this delegate method will be called before the disconnect method returns.
+**/
+- (void)onSocketDidDisconnect:(AsyncSocket *)sock;
+
+/**
+ * Called when a socket accepts a connection. Another socket is spawned to handle it. The new socket will have
+ * the same delegate and will call "onSocket:didConnectToHost:port:".
+**/
+- (void)onSocket:(AsyncSocket *)sock didAcceptNewSocket:(AsyncSocket *)newSocket;
+
+/**
+ * Called when a new socket is spawned to handle a connection. This method should return the run-loop of the
+ * thread on which the new socket and its delegate should operate. If omitted, [NSRunLoop currentRunLoop] is used.
+**/
+- (NSRunLoop *)onSocket:(AsyncSocket *)sock wantsRunLoopForNewSocket:(AsyncSocket *)newSocket;
+
+/**
+ * Called when a socket is about to connect. This method should return YES to continue, or NO to abort.
+ * If aborted, will result in AsyncSocketCanceledError.
+ *
+ * If the connectToHost:onPort:error: method was called, the delegate will be able to access and configure the
+ * CFReadStream and CFWriteStream as desired prior to connection.
+ *
+ * If the connectToAddress:error: method was called, the delegate will be able to access and configure the
+ * CFSocket and CFSocketNativeHandle (BSD socket) as desired prior to connection. You will be able to access and
+ * configure the CFReadStream and CFWriteStream in the onSocket:didConnectToHost:port: method.
+**/
+- (BOOL)onSocketWillConnect:(AsyncSocket *)sock;
+
+/**
+ * Called when a socket connects and is ready for reading and writing.
+ * The host parameter will be an IP address, not a DNS name.
+**/
+- (void)onSocket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UInt16)port;
+
+/**
+ * Called when a socket has completed reading the requested data into memory.
+ * Not called if there is an error.
+**/
+- (void)onSocket:(AsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag;
+
+/**
+ * Called when a socket has read in data, but has not yet completed the read.
+ * This would occur if using readToData: or readToLength: methods.
+ * It may be used to for things such as updating progress bars.
+**/
+- (void)onSocket:(AsyncSocket *)sock didReadPartialDataOfLength:(CFIndex)partialLength tag:(long)tag;
+
+/**
+ * Called when a socket has completed writing the requested data. Not called if there is an error.
+**/
+- (void)onSocket:(AsyncSocket *)sock didWriteDataWithTag:(long)tag;
+
+/**
+ * Called when a socket has written some data, but has not yet completed the entire write.
+ * It may be used to for things such as updating progress bars.
+**/
+- (void)onSocket:(AsyncSocket *)sock didWritePartialDataOfLength:(CFIndex)partialLength tag:(long)tag;
+
+/**
+ * Called if a read operation has reached its timeout without completing.
+ * This method allows you to optionally extend the timeout.
+ * If you return a positive time interval (> 0) the read's timeout will be extended by the given amount.
+ * If you don't implement this method, or return a non-positive time interval (<= 0) the read will timeout as usual.
+ *
+ * The elapsed parameter is the sum of the original timeout, plus any additions previously added via this method.
+ * The length parameter is the number of bytes that have been read so far for the read operation.
+ *
+ * Note that this method may be called multiple times for a single read if you return positive numbers.
+**/
+- (NSTimeInterval)onSocket:(AsyncSocket *)sock
+ shouldTimeoutReadWithTag:(long)tag
+ elapsed:(NSTimeInterval)elapsed
+ bytesDone:(CFIndex)length;
+
+/**
+ * Called if a write operation has reached its timeout without completing.
+ * This method allows you to optionally extend the timeout.
+ * If you return a positive time interval (> 0) the write's timeout will be extended by the given amount.
+ * If you don't implement this method, or return a non-positive time interval (<= 0) the write will timeout as usual.
+ *
+ * The elapsed parameter is the sum of the original timeout, plus any additions previously added via this method.
+ * The length parameter is the number of bytes that have been written so far for the write operation.
+ *
+ * Note that this method may be called multiple times for a single write if you return positive numbers.
+**/
+- (NSTimeInterval)onSocket:(AsyncSocket *)sock
+ shouldTimeoutWriteWithTag:(long)tag
+ elapsed:(NSTimeInterval)elapsed
+ bytesDone:(CFIndex)length;
+
+/**
+ * Called after the socket has successfully completed SSL/TLS negotiation.
+ * This method is not called unless you use the provided startTLS method.
+ *
+ * If a SSL/TLS negotiation fails (invalid certificate, etc) then the socket will immediately close,
+ * and the onSocket:willDisconnectWithError: delegate method will be called with the specific SSL error code.
+**/
+- (void)onSocketDidSecure:(AsyncSocket *)sock;
+
+@end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+@interface AsyncSocket : NSObject
+{
+ CFSocketRef theSocket4; // IPv4 accept or connect socket
+ CFSocketRef theSocket6; // IPv6 accept or connect socket
+ CFReadStreamRef theReadStream;
+ CFWriteStreamRef theWriteStream;
+
+ CFRunLoopSourceRef theSource4; // For theSocket4
+ CFRunLoopSourceRef theSource6; // For theSocket6
+ CFRunLoopRef theRunLoop;
+ CFSocketContext theContext;
+ NSArray *theRunLoopModes;
+
+ NSTimer *theConnectTimer;
+
+ NSMutableArray *theReadQueue;
+ AsyncReadPacket *theCurrentRead;
+ NSTimer *theReadTimer;
+ NSMutableData *partialReadBuffer;
+
+ NSMutableArray *theWriteQueue;
+ AsyncWritePacket *theCurrentWrite;
+ NSTimer *theWriteTimer;
+
+ id theDelegate;
+ UInt16 theFlags;
+
+ long theUserData;
+}
+
+- (id)init;
+- (id)initWithDelegate:(id)delegate;
+- (id)initWithDelegate:(id)delegate userData:(long)userData;
+
+/* String representation is long but has no "\n". */
+- (NSString *)description;
+
+/**
+ * Use "canSafelySetDelegate" to see if there is any pending business (reads and writes) with the current delegate
+ * before changing it. It is, of course, safe to change the delegate before connecting or accepting connections.
+**/
+- (id)delegate;
+- (BOOL)canSafelySetDelegate;
+- (void)setDelegate:(id)delegate;
+
+/* User data can be a long, or an id or void * cast to a long. */
+- (long)userData;
+- (void)setUserData:(long)userData;
+
+/* Don't use these to read or write. And don't close them either! */
+- (CFSocketRef)getCFSocket;
+- (CFReadStreamRef)getCFReadStream;
+- (CFWriteStreamRef)getCFWriteStream;
+
+// Once one of the accept or connect methods are called, the AsyncSocket instance is locked in
+// and the other accept/connect methods can't be called without disconnecting the socket first.
+// If the attempt fails or times out, these methods either return NO or
+// call "onSocket:willDisconnectWithError:" and "onSockedDidDisconnect:".
+
+// When an incoming connection is accepted, AsyncSocket invokes several delegate methods.
+// These methods are (in chronological order):
+// 1. onSocket:didAcceptNewSocket:
+// 2. onSocket:wantsRunLoopForNewSocket:
+// 3. onSocketWillConnect:
+//
+// Your server code will need to retain the accepted socket (if you want to accept it).
+// The best place to do this is probably in the onSocket:didAcceptNewSocket: method.
+//
+// After the read and write streams have been setup for the newly accepted socket,
+// the onSocket:didConnectToHost:port: method will be called on the proper run loop.
+//
+// Multithreading Note: If you're going to be moving the newly accepted socket to another run
+// loop by implementing onSocket:wantsRunLoopForNewSocket:, then you should wait until the
+// onSocket:didConnectToHost:port: method before calling read, write, or startTLS methods.
+// Otherwise read/write events are scheduled on the incorrect runloop, and chaos may ensue.
+
+/**
+ * Tells the socket to begin listening and accepting connections on the given port.
+ * When a connection comes in, the AsyncSocket instance will call the various delegate methods (see above).
+ * The socket will listen on all available interfaces (e.g. wifi, ethernet, etc)
+**/
+- (BOOL)acceptOnPort:(UInt16)port error:(NSError **)errPtr;
+
+/**
+ * This method is the same as acceptOnPort:error: with the additional option
+ * of specifying which interface to listen on. So, for example, if you were writing code for a server that
+ * has multiple IP addresses, you could specify which address you wanted to listen on. Or you could use it
+ * to specify that the socket should only accept connections over ethernet, and not other interfaces such as wifi.
+ * You may also use the special strings "localhost" or "loopback" to specify that
+ * the socket only accept connections from the local machine.
+ *
+ * To accept connections on any interface pass nil, or simply use the acceptOnPort:error: method.
+**/
+- (BOOL)acceptOnInterface:(NSString *)interface port:(UInt16)port error:(NSError **)errPtr;
+
+/**
+ * Connects to the given host and port.
+ * The host may be a domain name (e.g. "deusty.com") or an IP address string (e.g. "192.168.0.2")
+**/
+- (BOOL)connectToHost:(NSString *)hostname onPort:(UInt16)port error:(NSError **)errPtr;
+
+/**
+ * This method is the same as connectToHost:onPort:error: with an additional timeout option.
+ * To not time out use a negative time interval, or simply use the connectToHost:onPort:error: method.
+**/
+- (BOOL)connectToHost:(NSString *)hostname
+ onPort:(UInt16)port
+ withTimeout:(NSTimeInterval)timeout
+ error:(NSError **)errPtr;
+
+/**
+ * Connects to the given address, specified as a sockaddr structure wrapped in a NSData object.
+ * For example, a NSData object returned from NSNetservice's addresses method.
+ *
+ * If you have an existing struct sockaddr you can convert it to a NSData object like so:
+ * struct sockaddr sa -> NSData *dsa = [NSData dataWithBytes:&remoteAddr length:remoteAddr.sa_len];
+ * struct sockaddr *sa -> NSData *dsa = [NSData dataWithBytes:remoteAddr length:remoteAddr->sa_len];
+**/
+- (BOOL)connectToAddress:(NSData *)remoteAddr error:(NSError **)errPtr;
+
+/**
+ * This method is the same as connectToAddress:error: with an additional timeout option.
+ * To not time out use a negative time interval, or simply use the connectToAddress:error: method.
+**/
+- (BOOL)connectToAddress:(NSData *)remoteAddr withTimeout:(NSTimeInterval)timeout error:(NSError **)errPtr;
+
+/**
+ * Disconnects immediately. Any pending reads or writes are dropped.
+ * If the socket is not already disconnected, the onSocketDidDisconnect delegate method
+ * will be called immediately, before this method returns.
+ *
+ * Please note the recommended way of releasing an AsyncSocket instance (e.g. in a dealloc method)
+ * [asyncSocket setDelegate:nil];
+ * [asyncSocket disconnect];
+ * [asyncSocket release];
+**/
+- (void)disconnect;
+
+/**
+ * Disconnects after all pending reads have completed.
+ * After calling this, the read and write methods will do nothing.
+ * The socket will disconnect even if there are still pending writes.
+**/
+- (void)disconnectAfterReading;
+
+/**
+ * Disconnects after all pending writes have completed.
+ * After calling this, the read and write methods will do nothing.
+ * The socket will disconnect even if there are still pending reads.
+**/
+- (void)disconnectAfterWriting;
+
+/**
+ * Disconnects after all pending reads and writes have completed.
+ * After calling this, the read and write methods will do nothing.
+**/
+- (void)disconnectAfterReadingAndWriting;
+
+/* Returns YES if the socket and streams are open, connected, and ready for reading and writing. */
+- (BOOL)isConnected;
+
+/**
+ * Returns the local or remote host and port to which this socket is connected, or nil and 0 if not connected.
+ * The host will be an IP address.
+**/
+- (NSString *)connectedHost;
+- (UInt16)connectedPort;
+
+- (NSString *)localHost;
+- (UInt16)localPort;
+
+/**
+ * Returns the local or remote address to which this socket is connected,
+ * specified as a sockaddr structure wrapped in a NSData object.
+ *
+ * See also the connectedHost, connectedPort, localHost and localPort methods.
+**/
+- (NSData *)connectedAddress;
+- (NSData *)localAddress;
+
+/**
+ * Returns whether the socket is IPv4 or IPv6.
+ * An accepting socket may be both.
+**/
+- (BOOL)isIPv4;
+- (BOOL)isIPv6;
+
+// The readData and writeData methods won't block.
+//
+// You may optionally set a timeout for any read/write operation. (To not timeout, use a negative time interval.)
+// If a read/write opertion times out, the corresponding "onSocket:shouldTimeout..." delegate method
+// is called to optionally allow you to extend the timeout.
+// Upon a timeout, the "onSocket:willDisconnectWithError:" method is called, followed by "onSocketDidDisconnect".
+//
+// The tag is for your convenience.
+// You can use it as an array index, step number, state id, pointer, etc., just like the socket's user data.
+
+/**
+ * This will read a certain number of bytes into memory, and call the delegate method when those bytes have been read.
+ *
+ * If the length is 0, this method does nothing and the delegate is not called.
+ * If the timeout value is negative, the read operation will not use a timeout.
+**/
+- (void)readDataToLength:(CFIndex)length withTimeout:(NSTimeInterval)timeout tag:(long)tag;
+
+/**
+ * This reads bytes until (and including) the passed "data" parameter, which acts as a separator.
+ * The bytes and the separator are returned by the delegate method.
+ *
+ * If you pass nil or zero-length data as the "data" parameter,
+ * the method will do nothing, and the delegate will not be called.
+ * If the timeout value is negative, the read operation will not use a timeout.
+ *
+ * To read a line from the socket, use the line separator (e.g. CRLF for HTTP, see below) as the "data" parameter.
+ * Note that this method is not character-set aware, so if a separator can occur naturally as part of the encoding for
+ * a character, the read will prematurely end.
+**/
+- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag;
+
+/**
+ * Same as readDataToData:withTimeout:tag, with the additional restriction that the amount of data read
+ * may not surpass the given maxLength (specified in bytes).
+ *
+ * If you pass a maxLength parameter that is less than the length of the data parameter,
+ * the method will do nothing, and the delegate will not be called.
+ *
+ * If the max length is surpassed, it is treated the same as a timeout - the socket is closed.
+ *
+ * Pass -1 as maxLength if no length restriction is desired, or simply use the readDataToData:withTimeout:tag method.
+**/
+- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout maxLength:(CFIndex)length tag:(long)tag;
+
+/**
+ * Reads the first available bytes that become available on the socket.
+ *
+ * If the timeout value is negative, the read operation will not use a timeout.
+**/
+- (void)readDataWithTimeout:(NSTimeInterval)timeout tag:(long)tag;
+
+/**
+ * Writes data to the socket, and calls the delegate when finished.
+ *
+ * If you pass in nil or zero-length data, this method does nothing and the delegate will not be called.
+ * If the timeout value is negative, the write operation will not use a timeout.
+**/
+- (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag;
+
+/**
+ * Returns progress of current read or write, from 0.0 to 1.0, or NaN if no read/write (use isnan() to check).
+ * "tag", "done" and "total" will be filled in if they aren't NULL.
+**/
+- (float)progressOfReadReturningTag:(long *)tag bytesDone:(CFIndex *)done total:(CFIndex *)total;
+- (float)progressOfWriteReturningTag:(long *)tag bytesDone:(CFIndex *)done total:(CFIndex *)total;
+
+/**
+ * Secures the connection using SSL/TLS.
+ *
+ * This method may be called at any time, and the TLS handshake will occur after all pending reads and writes
+ * are finished. This allows one the option of sending a protocol dependent StartTLS message, and queuing
+ * the upgrade to TLS at the same time, without having to wait for the write to finish.
+ * Any reads or writes scheduled after this method is called will occur over the secured connection.
+ *
+ * The possible keys and values for the TLS settings are well documented.
+ * Some possible keys are:
+ * - kCFStreamSSLLevel
+ * - kCFStreamSSLAllowsExpiredCertificates
+ * - kCFStreamSSLAllowsExpiredRoots
+ * - kCFStreamSSLAllowsAnyRoot
+ * - kCFStreamSSLValidatesCertificateChain
+ * - kCFStreamSSLPeerName
+ * - kCFStreamSSLCertificates
+ * - kCFStreamSSLIsServer
+ *
+ * Please refer to Apple's documentation for associated values, as well as other possible keys.
+ *
+ * If you pass in nil or an empty dictionary, the default settings will be used.
+ *
+ * The default settings will check to make sure the remote party's certificate is signed by a
+ * trusted 3rd party certificate agency (e.g. verisign) and that the certificate is not expired.
+ * However it will not verify the name on the certificate unless you
+ * give it a name to verify against via the kCFStreamSSLPeerName key.
+ * The security implications of this are important to understand.
+ * Imagine you are attempting to create a secure connection to MySecureServer.com,
+ * but your socket gets directed to MaliciousServer.com because of a hacked DNS server.
+ * If you simply use the default settings, and MaliciousServer.com has a valid certificate,
+ * the default settings will not detect any problems since the certificate is valid.
+ * To properly secure your connection in this particular scenario you
+ * should set the kCFStreamSSLPeerName property to "MySecureServer.com".
+ * If you do not know the peer name of the remote host in advance (for example, you're not sure
+ * if it will be "domain.com" or "www.domain.com"), then you can use the default settings to validate the
+ * certificate, and then use the X509Certificate class to verify the issuer after the socket has been secured.
+ * The X509Certificate class is part of the CocoaAsyncSocket open source project.
+**/
+- (void)startTLS:(NSDictionary *)tlsSettings;
+
+/**
+ * For handling readDataToData requests, data is necessarily read from the socket in small increments.
+ * The performance can be much improved by allowing AsyncSocket to read larger chunks at a time and
+ * store any overflow in a small internal buffer.
+ * This is termed pre-buffering, as some data may be read for you before you ask for it.
+ * If you use readDataToData a lot, enabling pre-buffering will result in better performance, especially on the iPhone.
+ *
+ * The default pre-buffering state is controlled by the DEFAULT_PREBUFFERING definition.
+ * It is highly recommended one leave this set to YES.
+ *
+ * This method exists in case pre-buffering needs to be disabled by default for some unforeseen reason.
+ * In that case, this method exists to allow one to easily enable pre-buffering when ready.
+**/
+- (void)enablePreBuffering;
+
+/**
+ * When you create an AsyncSocket, it is added to the runloop of the current thread.
+ * So for manually created sockets, it is easiest to simply create the socket on the thread you intend to use it.
+ *
+ * If a new socket is accepted, the delegate method onSocket:wantsRunLoopForNewSocket: is called to
+ * allow you to place the socket on a separate thread. This works best in conjunction with a thread pool design.
+ *
+ * If, however, you need to move the socket to a separate thread at a later time, this
+ * method may be used to accomplish the task.
+ *
+ * This method must be called from the thread/runloop the socket is currently running on.
+ *
+ * Note: After calling this method, all further method calls to this object should be done from the given runloop.
+ * Also, all delegate calls will be sent on the given runloop.
+**/
+- (BOOL)moveToRunLoop:(NSRunLoop *)runLoop;
+
+/**
+ * Allows you to configure which run loop modes the socket uses.
+ * The default set of run loop modes is NSDefaultRunLoopMode.
+ *
+ * If you'd like your socket to continue operation during other modes, you may want to add modes such as
+ * NSModalPanelRunLoopMode or NSEventTrackingRunLoopMode. Or you may simply want to use NSRunLoopCommonModes.
+ *
+ * Accepted sockets will automatically inherit the same run loop modes as the listening socket.
+ *
+ * Note: NSRunLoopCommonModes is defined in 10.5. For previous versions one can use kCFRunLoopCommonModes.
+**/
+- (BOOL)setRunLoopModes:(NSArray *)runLoopModes;
+
+/**
+ * Returns the current run loop modes the AsyncSocket instance is operating in.
+ * The default set of run loop modes is NSDefaultRunLoopMode.
+**/
+- (NSArray *)runLoopModes;
+
+/**
+ * In the event of an error, this method may be called during onSocket:willDisconnectWithError: to read
+ * any data that's left on the socket.
+**/
+- (NSData *)unreadData;
+
+/* A few common line separators, for use with the readDataToData:... methods. */
++ (NSData *)CRLFData; // 0x0D0A
++ (NSData *)CRData; // 0x0D
++ (NSData *)LFData; // 0x0A
++ (NSData *)ZeroData; // 0x00
+
+@end
Index: trunk/Classes/Communication/MKDatatypes.h
===================================================================
--- trunk/Classes/Communication/MKDatatypes.h (revision 0)
+++ trunk/Classes/Communication/MKDatatypes.h (revision 805)
@@ -0,0 +1,294 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+typedef enum {
+ MKAddressAll =0,
+ MKAddressFC =1,
+ MKAddressNC =2,
+ MKAddressMK3MAg=3,
+ MKAddressMKGPS =0XFE
+} MKAddress;
+
+static const int kMaxDebugData = 32;
+
+typedef enum {
+ MKCommandDebugValueRequest='d',
+ MKCommandDebugValueResponse='D',
+ MKCommandDebugLabelRequest='a',
+ MKCommandDebugLabelResponse='A',
+ MKCommandVersionRequest='v',
+ MKCommandVersionResponse='V',
+ MKCommandLcdMenuRequest='l',
+ MKCommandLcdMenuResponse='L',
+ MKCommandLcdRequest='h',
+ MKCommandLcdResponse='H',
+ MKCommandReadSettingsRequest='q',
+ MKCommandReadSettingsResponse='Q',
+ MKCommandWriteSettingsRequest='s',
+ MKCommandWriteSettingsResponse='S',
+ MKCommandChangeSettingsRequest='f',
+ MKCommandChangeSettingsResponse='F',
+ MKCommandChannelsValueRequest='p',
+ MKCommandChannelsValueResponse='P',
+ MKCommandMixerReadRequest='n',
+ MKCommandMixerReadResponse='N',
+ MKCommandMixerWriteRequest='m',
+ MKCommandMixerWriteResponse='M',
+ MKCommandRedirectRequest='u',
+ MKCommandEngineTestRequest='t',
+ MKCommandOsdRequest='o',
+ MKCommandOsdResponse='O',
+} MKCommandId;
+
+
+typedef struct
+{
+ uint8_t SWMajor;
+ uint8_t SWMinor;
+ uint8_t ProtoMajor;
+ uint8_t ProtoMinor;
+ uint8_t SWPatch;
+ uint8_t Reserved[5];
+} VersionInfo;
+
+typedef struct
+{
+ uint8_t Digital[2];
+ uint16_t Analog[32]; // Debugvalues
+} DebugOut;
+
+typedef struct
+{
+ char Revision;
+ char Name[12];
+ signed char Motor[16][4];
+} Mixer;
+
+typedef struct
+{
+ unsigned char Kanalbelegung[12]; // GAS[0], GIER[1],NICK[2], ROLL[3], POTI1, POTI2, POTI3
+ unsigned char GlobalConfig; // 0x01=H?henregler aktiv,0x02=Kompass aktiv, 0x04=GPS aktiv, 0x08=Heading Hold aktiv
+ unsigned char Hoehe_MinGas; // Wert : 0-100
+ unsigned char Luftdruck_D; // Wert : 0-250
+ unsigned char MaxHoehe; // Wert : 0-32
+ unsigned char Hoehe_P; // Wert : 0-32
+ unsigned char Hoehe_Verstaerkung; // Wert : 0-50
+ unsigned char Hoehe_ACC_Wirkung; // Wert : 0-250
+ unsigned char Hoehe_HoverBand; // Wert : 0-250
+ unsigned char Hoehe_GPS_Z; // Wert : 0-250
+ unsigned char Hoehe_StickNeutralPoint;// Wert : 0-250
+ unsigned char Stick_P; // Wert : 1-6
+ unsigned char Stick_D; // Wert : 0-64
+ unsigned char Gier_P; // Wert : 1-20
+ unsigned char Gas_Min; // Wert : 0-32
+ unsigned char Gas_Max; // Wert : 33-250
+ unsigned char GyroAccFaktor; // Wert : 1-64
+ unsigned char KompassWirkung; // Wert : 0-32
+ unsigned char Gyro_P; // Wert : 10-250
+ unsigned char Gyro_I; // Wert : 0-250
+ unsigned char Gyro_D; // Wert : 0-250
+ unsigned char Gyro_Gier_P; // Wert : 10-250
+ unsigned char Gyro_Gier_I; // Wert : 0-250
+ unsigned char UnterspannungsWarnung; // Wert : 0-250
+ unsigned char NotGas; // Wert : 0-250 //Gaswert bei Emp?ngsverlust
+ unsigned char NotGasZeit; // Wert : 0-250 // Zeitbis auf NotGas geschaltet wird, wg. Rx-Problemen
+ unsigned char Receiver; // 0= Summensignal, 1= Spektrum, 2 =Jeti, 3=ACT DSL, 4=ACT S3D
+ unsigned char I_Faktor; // Wert : 0-250
+ unsigned char UserParam1; // Wert : 0-250
+ unsigned char UserParam2; // Wert : 0-250
+ unsigned char UserParam3; // Wert : 0-250
+ unsigned char UserParam4; // Wert : 0-250
+ unsigned char ServoNickControl; // Wert : 0-250 // Stellung des Servos
+ unsigned char ServoNickComp; // Wert : 0-250 // Einfluss Gyro/Servo
+ unsigned char ServoNickMin; // Wert : 0-250 // Anschlag
+ unsigned char ServoNickMax; // Wert : 0-250 // Anschlag
+ unsigned char ServoRollControl; // Wert : 0-250 // Stellung des Servos
+ unsigned char ServoRollComp; // Wert : 0-250
+ unsigned char ServoRollMin; // Wert : 0-250
+ unsigned char ServoRollMax; // Wert : 0-250
+ unsigned char ServoNickRefresh; // Speed of the Servo
+ unsigned char Servo3; // Value or mapping of the Servo Output
+ unsigned char Servo4; // Value or mapping of the Servo Output
+ unsigned char Servo5; // Value or mapping of the Servo Output
+ unsigned char LoopGasLimit; // Wert: 0-250 max. Gas w?hrend Looping
+ unsigned char LoopThreshold; // Wert: 0-250 Schwelle f?r Stickausschlag
+ unsigned char LoopHysterese; // Wert: 0-250 Hysterese f?r Stickausschlag
+ unsigned char AchsKopplung1; // Wert: 0-250 Faktor, mit dem Gier die Achsen Roll und Nick koppelt (NickRollMitkopplung)
+ unsigned char AchsKopplung2; // Wert: 0-250 Faktor, mit dem Nick und Roll verkoppelt werden
+ unsigned char CouplingYawCorrection; // Wert: 0-250 Faktor, mit dem Nick und Roll verkoppelt werden
+ unsigned char WinkelUmschlagNick; // Wert: 0-250 180?-Punkt
+ unsigned char WinkelUmschlagRoll; // Wert: 0-250 180?-Punkt
+ unsigned char GyroAccAbgleich; // 1/k (Koppel_ACC_Wirkung)
+ unsigned char Driftkomp;
+ unsigned char DynamicStability;
+ unsigned char UserParam5; // Wert : 0-250
+ unsigned char UserParam6; // Wert : 0-250
+ unsigned char UserParam7; // Wert : 0-250
+ unsigned char UserParam8; // Wert : 0-250
+ unsigned char J16Bitmask; // for the J16 Output
+ unsigned char J16Timing; // for the J16 Output
+ unsigned char J17Bitmask; // for the J17 Output
+ unsigned char J17Timing; // for the J17 Output
+ unsigned char WARN_J16_Bitmask; // for the J16 Output
+ unsigned char WARN_J17_Bitmask; // for the J17 Output
+ unsigned char NaviGpsModeControl; // Parameters for the Naviboard
+ unsigned char NaviGpsGain;
+ unsigned char NaviGpsP;
+ unsigned char NaviGpsI;
+ unsigned char NaviGpsD;
+ unsigned char NaviGpsPLimit;
+ unsigned char NaviGpsILimit;
+ unsigned char NaviGpsDLimit;
+ unsigned char NaviGpsACC;
+ unsigned char NaviGpsMinSat;
+ unsigned char NaviStickThreshold;
+ unsigned char NaviWindCorrection;
+ unsigned char NaviSpeedCompensation;
+ unsigned char NaviOperatingRadius;
+ unsigned char NaviAngleLimitation;
+ unsigned char NaviPH_LoginTime;
+ unsigned char ExternalControl; // for serial Control
+ unsigned char BitConfig; // (war Loop-Cfg) Bitcodiert: 0x01=oben, 0x02=unten, 0x04=links, 0x08=rechts / wird getrennt behandelt
+ unsigned char ServoCompInvert; // // 0x01 = Nick, 0x02 = Roll 0 oder 1 // WICHTIG!!! am Ende lassen
+ unsigned char ExtraConfig; // bitcodiert
+ char Name[12];
+} MKSetting;
+
+#define CFG_HOEHENREGELUNG 0x01
+#define CFG_HOEHEN_SCHALTER 0x02
+#define CFG_HEADING_HOLD 0x04
+#define CFG_KOMPASS_AKTIV 0x08
+#define CFG_KOMPASS_FIX 0x10
+#define CFG_GPS_AKTIV 0x20
+#define CFG_ACHSENKOPPLUNG_AKTIV 0x40
+#define CFG_DREHRATEN_BEGRENZER 0x80
+
+#define CFG_LOOP_OBEN 0x01
+#define CFG_LOOP_UNTEN 0x02
+#define CFG_LOOP_LINKS 0x04
+#define CFG_LOOP_RECHTS 0x08
+#define CFG_MOTOR_BLINK 0x10
+#define CFG_MOTOR_OFF_LED1 0x20
+#define CFG_MOTOR_OFF_LED2 0x40
+#define CFG_RES4 0x80
+
+#define CFG2_HEIGHT_LIMIT 0x01
+#define CFG2_VARIO_BEEP 0x02
+#define CFG_SENSITIVE_RC 0x04
+
+#define CFG2_INVERT_NICK 0x01
+#define CFG2_INVERT_ROLL 0x02
+
+//////////////////////////////////////////////////////////////////////////////////////////
+
+typedef struct
+{
+ int16_t AngleNick; // in 0.1 deg
+ int16_t AngleRoll; // in 0.1 deg
+ int16_t Heading; // in 0.1 deg
+ uint8_t reserve[8];
+} Data3D_t;
+
+
+
+typedef struct
+{
+ int32_t Longitude; // in 1E-7 deg
+ int32_t Latitude; // in 1E-7 deg
+ int32_t Altitude; // in mm
+ uint8_t Status; // validity of data
+} __attribute__((packed)) GPS_Pos_t;
+
+typedef struct
+{
+ uint16_t Distance; // distance to target in dm
+ int16_t Bearing; // course to target in deg
+} __attribute__((packed)) GPS_PosDev_t;
+
+typedef struct
+{
+ uint8_t Version; // version of the data structure
+ GPS_Pos_t CurrentPosition; // see ubx.h for details
+ GPS_Pos_t TargetPosition;
+ GPS_PosDev_t TargetPositionDeviation;
+ GPS_Pos_t HomePosition;
+ GPS_PosDev_t HomePositionDeviation;
+ uint8_t WaypointIndex; // index of current waypoints running from 0 to WaypointNumber-1
+ uint8_t WaypointNumber; // number of stored waypoints
+ uint8_t SatsInUse; // number of satellites used for position solution
+ int16_t Altimeter; // hight according to air pressure
+ int16_t Variometer; // climb(+) and sink(-) rate
+ uint16_t FlyingTime; // in seconds
+ uint8_t UBat; // Battery Voltage in 0.1 Volts
+ uint16_t GroundSpeed; // speed over ground in cm/s (2D)
+ int16_t Heading; // current flight direction in ° as angle to north
+ int16_t CompassHeading; // current compass value in °
+ int8_t AngleNick; // current Nick angle in 1°
+ int8_t AngleRoll; // current Rick angle in 1°
+ uint8_t RC_Quality; // RC_Quality
+ uint8_t FCFlags; // Flags from FC
+ uint8_t NCFlags; // Flags from NC
+ uint8_t Errorcode; // 0 --> okay
+ uint8_t OperatingRadius; // current operation radius around the Home Position in m
+ int16_t TopSpeed; // velocity in vertical direction in cm/s
+ uint8_t TargetHoldTime; // time in s to stay at the given target, counts down to 0 if target has been reached
+ uint8_t RC_RSSI; // Receiver signal strength (since version 2 added)
+ int16_t SetpointAltitude; // setpoint for altitude
+ uint8_t Gas; // for future use
+ uint16_t Current; // actual current in 0.1A steps
+ uint16_t UsedCapacity; // used capacity in mAh
+
+} __attribute__((packed)) NaviData_t;
+
+typedef struct
+{
+ GPS_Pos_t Position; // the gps position of the waypoint, see ubx.h for details
+ int16_t Heading; // orientation, future implementation
+ uint8_t ToleranceRadius; // in meters, if the MK is within that range around the target, then the next target is triggered
+ uint8_t HoldTime; // in seconds, if the was once in the tolerance area around a WP, this time defies the delay before the next WP is triggered
+ uint8_t Event_Flag; // future emplementation
+ uint8_t reserve[12]; // reserve
+} __attribute__((packed)) WayPoint_t;
+
+
+#define NAVIDATA_VERSION 3
+
+#define NC_FLAG_FREE 0x01
+#define NC_FLAG_PH 0x02
+#define NC_FLAG_CH 0x04
+#define NC_FLAG_RANGE_LIMIT 0x08
+#define NC_FLAG_NOSERIALLINK 0x10
+#define NC_FLAG_TARGET_REACHED 0x20
+#define NC_FLAG_MANUAL_CONTROL 0x40
+#define NC_FLAG_8 0x80
+
+#define FCFLAG_MOTOR_RUN 0x01
+#define FCFLAG_FLY 0x02
+#define FCFLAG_CALIBRATE 0x04
+#define FCFLAG_START 0x08
+#define FCFLAG_NOTLANDUNG 0x10
+#define FCFLAG_LOWBAT 0x20
+#define FCFLAG_SPI_RX_ERR 0x40
+#define FCFLAG_I2CERR 0x80
+
Index: trunk/Classes/Communication/MKConnection.h
===================================================================
--- trunk/Classes/Communication/MKConnection.h (revision 0)
+++ trunk/Classes/Communication/MKConnection.h (revision 805)
@@ -0,0 +1,48 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+
+@protocol MKConnectionDelegate < NSObject >
+@optional
+
+- (void) didConnectTo:(NSString *)hostOrDevice;
+- (void) willDisconnectWithError:(NSError *)err;
+- (void) didDisconnect;
+- (void) didReadMkData:(NSData *)data;
+
+@end
+
+@protocol MKConnection
+
+@property(assign) id<MKConnectionDelegate> delegate;
+
+- (id) initWithDelegate:(id<MKConnectionDelegate>)delegate;
+
+- (BOOL) connectTo:(NSString *)hostOrDevice error:(NSError **)err;
+- (BOOL) isConnected;
+- (void) disconnect;
+
+- (void) writeMkData:(NSData *)data;
+@end
Index: trunk/Classes/Communication/SynthesizeSingleton.h
===================================================================
--- trunk/Classes/Communication/SynthesizeSingleton.h (revision 0)
+++ trunk/Classes/Communication/SynthesizeSingleton.h (revision 805)
@@ -0,0 +1,68 @@
+//
+// SynthesizeSingleton.h
+// CocoaWithLove
+//
+// Created by Matt Gallagher on 20/10/08.
+// Copyright 2009 Matt Gallagher. All rights reserved.
+//
+// Permission is given to use this source code file without charge in any
+// project, commercial or otherwise, entirely at your risk, with the condition
+// that any redistribution (in part or whole) of source code must retain
+// this copyright and permission notice. Attribution in compiled projects is
+// appreciated but not required.
+//
+
+#define SYNTHESIZE_SINGLETON_FOR_CLASS(classname) \
+ \
+static classname *shared##classname = nil; \
+ \
++ (classname *)shared##classname \
+{ \
+ @synchronized(self) \
+ { \
+ if (shared##classname == nil) \
+ { \
+ shared##classname = [[self alloc] init]; \
+ } \
+ } \
+ \
+ return shared##classname; \
+} \
+ \
++ (id)allocWithZone:(NSZone *)zone \
+{ \
+ @synchronized(self) \
+ { \
+ if (shared##classname == nil) \
+ { \
+ shared##classname = [super allocWithZone:zone]; \
+ return shared##classname; \
+ } \
+ } \
+ \
+ return nil; \
+} \
+ \
+- (id)copyWithZone:(NSZone *)zone \
+{ \
+ return self; \
+} \
+ \
+- (id)retain \
+{ \
+ return self; \
+} \
+ \
+- (NSUInteger)retainCount \
+{ \
+ return NSUIntegerMax; \
+} \
+ \
+- (void)release \
+{ \
+} \
+ \
+- (id)autorelease \
+{ \
+ return self; \
+}
Index: trunk/Classes/Communication/MKQmkIpConnection.h
===================================================================
--- trunk/Classes/Communication/MKQmkIpConnection.h (revision 0)
+++ trunk/Classes/Communication/MKQmkIpConnection.h (revision 805)
@@ -0,0 +1,32 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "MKIpConnection.h"
+
+@interface MKQmkIpConnection : MKIpConnection {
+
+}
+
+@end
Index: trunk/Classes/Communication/NSData+MKCommandEncode.h
===================================================================
--- trunk/Classes/Communication/NSData+MKCommandEncode.h (revision 0)
+++ trunk/Classes/Communication/NSData+MKCommandEncode.h (revision 805)
@@ -0,0 +1,40 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "MKDatatypes.h"
+
+@interface NSData (MKCommandEncode)
+
+- (NSData *) dataWithCommand:(MKCommandId)aCommand forAddress:(MKAddress)aAddress;
+
++ (NSData *) dataWithCommand:(MKCommandId)aCommand
+ forAddress:(MKAddress)aAddress
+ payloadForByte:(uint8_t)byte;
+
++ (NSData *) dataWithCommand:(MKCommandId)aCommand
+ forAddress:(MKAddress)aAddress
+ payloadWithBytes:(const void *)bytes
+ length:(NSUInteger)length;
+@end
Index: trunk/Classes/Communication/NSData+MKPayloadDecode.h
===================================================================
--- trunk/Classes/Communication/NSData+MKPayloadDecode.h (revision 0)
+++ trunk/Classes/Communication/NSData+MKPayloadDecode.h (revision 805)
@@ -0,0 +1,46 @@
+// ///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2010, Frank Blumenberg
+//
+// See License.txt for complete licensing and attribution information.
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// ///////////////////////////////////////////////////////////////////////////////
+
+#import <Foundation/Foundation.h>
+#import "MKDatatypes.h"
+
+@interface NSData (MKPayloadDecode)
+
+- (NSDictionary *) decodeLcdMenuResponseForAddress:(MKAddress)address;
+- (NSDictionary *) decodeLcdResponseForAddress:(MKAddress)address;
+- (NSDictionary *) decodeVersionResponseForAddress:(MKAddress)theAddress;
+- (NSDictionary *) decodeAnalogLabelResponseForAddress:(MKAddress)address;
+- (NSDictionary *) decodeDebugDataResponseForAddress:(MKAddress)address;
+- (NSDictionary *) decodeChannelsDataResponse;
+- (NSDictionary *) decodeOsdResponse;
+
+
+
+@end
+
+@interface NSData (MKPayloadDecodeSetting)
+- (NSDictionary *) decodeReadSettingResponse;
+- (NSDictionary *) decodeWriteSettingResponse;
+- (NSDictionary *) decodeChangeSettingResponse;
+@end
Index: trunk/Classes/Communication/AsyncSocket.m
===================================================================
--- trunk/Classes/Communication/AsyncSocket.m (revision 0)
+++ trunk/Classes/Communication/AsyncSocket.m (revision 805)
@@ -0,0 +1,3184 @@
+//
+// AsyncSocket.m
+//
+// This class is in the public domain.
+// Originally created by Dustin Voss on Wed Jan 29 2003.
+// Updated and maintained by Deusty Designs and the Mac development community.
+//
+// http://code.google.com/p/cocoaasyncsocket/
+//
+
+#import "AsyncSocket.h"
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <arpa/inet.h>
+#import <netdb.h>
+
+#if TARGET_OS_IPHONE
+// Note: You may need to add the CFNetwork Framework to your project
+#import <CFNetwork/CFNetwork.h>
+#endif
+
+#pragma mark Declarations
+
+#define DEFAULT_PREBUFFERING YES // Whether pre-buffering is enabled by default
+
+#define READQUEUE_CAPACITY 5 // Initial capacity
+#define WRITEQUEUE_CAPACITY 5 // Initial capacity
+#define READALL_CHUNKSIZE 256 // Incremental increase in buffer size
+#define WRITE_CHUNKSIZE (1024 * 4) // Limit on size of each write pass
+
+NSString *const AsyncSocketException = @"AsyncSocketException";
+NSString *const AsyncSocketErrorDomain = @"AsyncSocketErrorDomain";
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+// Mutex lock used by all instances of AsyncSocket, to protect getaddrinfo.
+// Prior to Mac OS X 10.5 this method was not thread-safe.
+static NSString *getaddrinfoLock = @"lock";
+#endif
+
+enum AsyncSocketFlags
+{
+ kEnablePreBuffering = 1 << 0, // If set, pre-buffering is enabled
+ kDidPassConnectMethod = 1 << 1, // If set, disconnection results in delegate call
+ kDidCompleteOpenForRead = 1 << 2, // If set, open callback has been called for read stream
+ kDidCompleteOpenForWrite = 1 << 3, // If set, open callback has been called for write stream
+ kStartingReadTLS = 1 << 4, // If set, we're waiting for TLS negotiation to complete
+ kStartingWriteTLS = 1 << 5, // If set, we're waiting for TLS negotiation to complete
+ kForbidReadsWrites = 1 << 6, // If set, no new reads or writes are allowed
+ kDisconnectAfterReads = 1 << 7, // If set, disconnect after no more reads are queued
+ kDisconnectAfterWrites = 1 << 8, // If set, disconnect after no more writes are queued
+ kClosingWithError = 1 << 9, // If set, the socket is being closed due to an error
+ kDequeueReadScheduled = 1 << 10, // If set, a maybeDequeueRead operation is already scheduled
+ kDequeueWriteScheduled = 1 << 11, // If set, a maybeDequeueWrite operation is already scheduled
+ kSocketCanAcceptBytes = 1 << 12, // If set, we know socket can accept bytes. If unset, it's unknown.
+ kSocketHasBytesAvailable = 1 << 13, // If set, we know socket has bytes available. If unset, it's unknown.
+};
+
+@interface AsyncSocket (Private)
+
+// Connecting
+- (void)startConnectTimeout:(NSTimeInterval)timeout;
+- (void)endConnectTimeout;
+
+// Socket Implementation
+- (CFSocketRef)newAcceptSocketForAddress:(NSData *)addr error:(NSError **)errPtr;
+- (BOOL)createSocketForAddress:(NSData *)remoteAddr error:(NSError **)errPtr;
+- (BOOL)attachSocketsToRunLoop:(NSRunLoop *)runLoop error:(NSError **)errPtr;
+- (BOOL)configureSocketAndReturnError:(NSError **)errPtr;
+- (BOOL)connectSocketToAddress:(NSData *)remoteAddr error:(NSError **)errPtr;
+- (void)doAcceptWithSocket:(CFSocketNativeHandle)newSocket;
+- (void)doSocketOpen:(CFSocketRef)sock withCFSocketError:(CFSocketError)err;
+
+// Stream Implementation
+- (BOOL)createStreamsFromNative:(CFSocketNativeHandle)native error:(NSError **)errPtr;
+- (BOOL)createStreamsToHost:(NSString *)hostname onPort:(UInt16)port error:(NSError **)errPtr;
+- (BOOL)attachStreamsToRunLoop:(NSRunLoop *)runLoop error:(NSError **)errPtr;
+- (BOOL)configureStreamsAndReturnError:(NSError **)errPtr;
+- (BOOL)openStreamsAndReturnError:(NSError **)errPtr;
+- (void)doStreamOpen;
+- (BOOL)setSocketFromStreamsAndReturnError:(NSError **)errPtr;
+
+// Disconnect Implementation
+- (void)closeWithError:(NSError *)err;
+- (void)recoverUnreadData;
+- (void)emptyQueues;
+- (void)close;
+
+// Errors
+- (NSError *)getErrnoError;
+- (NSError *)getAbortError;
+- (NSError *)getStreamError;
+- (NSError *)getSocketError;
+- (NSError *)getConnectTimeoutError;
+- (NSError *)getReadMaxedOutError;
+- (NSError *)getReadTimeoutError;
+- (NSError *)getWriteTimeoutError;
+- (NSError *)errorFromCFStreamError:(CFStreamError)err;
+
+// Diagnostics
+- (BOOL)isSocketConnected;
+- (BOOL)areStreamsConnected;
+- (NSString *)connectedHost:(CFSocketRef)socket;
+- (UInt16)connectedPort:(CFSocketRef)socket;
+- (NSString *)localHost:(CFSocketRef)socket;
+- (UInt16)localPort:(CFSocketRef)socket;
+- (NSString *)addressHost:(CFDataRef)cfaddr;
+- (UInt16)addressPort:(CFDataRef)cfaddr;
+
+// Reading
+- (void)doBytesAvailable;
+- (void)completeCurrentRead;
+- (void)endCurrentRead;
+- (void)scheduleDequeueRead;
+- (void)maybeDequeueRead;
+- (void)doReadTimeout:(NSTimer *)timer;
+
+// Writing
+- (void)doSendBytes;
+- (void)completeCurrentWrite;
+- (void)endCurrentWrite;
+- (void)scheduleDequeueWrite;
+- (void)maybeDequeueWrite;
+- (void)maybeScheduleDisconnect;
+- (void)doWriteTimeout:(NSTimer *)timer;
+
+// Run Loop
+- (void)runLoopAddSource:(CFRunLoopSourceRef)source;
+- (void)runLoopRemoveSource:(CFRunLoopSourceRef)source;
+- (void)runLoopAddTimer:(NSTimer *)timer;
+- (void)runLoopRemoveTimer:(NSTimer *)timer;
+- (void)runLoopUnscheduleReadStream;
+- (void)runLoopUnscheduleWriteStream;
+
+// Security
+- (void)maybeStartTLS;
+- (void)onTLSHandshakeSuccessful;
+
+// Callbacks
+- (void)doCFCallback:(CFSocketCallBackType)type forSocket:(CFSocketRef)sock withAddress:(NSData *)address withData:(const void *)pData;
+- (void)doCFReadStreamCallback:(CFStreamEventType)type forStream:(CFReadStreamRef)stream;
+- (void)doCFWriteStreamCallback:(CFStreamEventType)type forStream:(CFWriteStreamRef)stream;
+
+@end
+
+static void MyCFSocketCallback(CFSocketRef, CFSocketCallBackType, CFDataRef, const void *, void *);
+static void MyCFReadStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void *pInfo);
+static void MyCFWriteStreamCallback(CFWriteStreamRef stream, CFStreamEventType type, void *pInfo);
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * The AsyncReadPacket encompasses the instructions for any given read.
+ * The content of a read packet allows the code to determine if we're:
+ * - reading to a certain length
+ * - reading to a certain separator
+ * - or simply reading the first chunk of available data
+**/
+@interface AsyncReadPacket : NSObject
+{
+ @public
+ NSMutableData *buffer;
+ CFIndex bytesDone;
+ NSTimeInterval timeout;
+ CFIndex maxLength;
+ long tag;
+ NSData *term;
+ BOOL readAllAvailableData;
+}
+- (id)initWithData:(NSMutableData *)d
+ timeout:(NSTimeInterval)t
+ tag:(long)i
+ readAllAvailable:(BOOL)a
+ terminator:(NSData *)e
+ maxLength:(CFIndex)m;
+
+- (unsigned)readLengthForTerm;
+
+- (unsigned)prebufferReadLengthForTerm;
+- (CFIndex)searchForTermAfterPreBuffering:(CFIndex)numBytes;
+@end
+
+@implementation AsyncReadPacket
+
+- (id)initWithData:(NSMutableData *)d
+ timeout:(NSTimeInterval)t
+ tag:(long)i
+ readAllAvailable:(BOOL)a
+ terminator:(NSData *)e
+ maxLength:(CFIndex)m
+{
+ if((self = [super init]))
+ {
+ buffer = [d retain];
+ timeout = t;
+ tag = i;
+ readAllAvailableData = a;
+ term = [e copy];
+ bytesDone = 0;
+ maxLength = m;
+ }
+ return self;
+}
+
+/**
+ * For read packets with a set terminator, returns the safe length of data that can be read
+ * without going over a terminator, or the maxLength.
+ *
+ * It is assumed the terminator has not already been read.
+**/
+- (unsigned)readLengthForTerm
+{
+ NSAssert(term != nil, @"Searching for term in data when there is no term.");
+
+ // What we're going to do is look for a partial sequence of the terminator at the end of the buffer.
+ // If a partial sequence occurs, then we must assume the next bytes to arrive will be the rest of the term,
+ // and we can only read that amount.
+ // Otherwise, we're safe to read the entire length of the term.
+
+ unsigned result = [term length];
+
+ // Shortcut when term is a single byte
+ if(result == 1) return result;
+
+ // i = index within buffer at which to check data
+ // j = length of term to check against
+
+ // Note: Beware of implicit casting rules
+ // This could give you -1: MAX(0, (0 - [term length] + 1));
+
+ CFIndex i = MAX(0, (CFIndex)(bytesDone - [term length] + 1));
+ CFIndex j = MIN([term length] - 1, bytesDone);
+
+ while(i < bytesDone)
+ {
+ const void *subBuffer = [buffer bytes] + i;
+
+ if(memcmp(subBuffer, [term bytes], j) == 0)
+ {
+ result = [term length] - j;
+ break;
+ }
+
+ i++;
+ j--;
+ }
+
+ if(maxLength > 0)
+ return MIN(result, (maxLength - bytesDone));
+ else
+ return result;
+}
+
+/**
+ * Assuming pre-buffering is enabled, returns the amount of data that can be read
+ * without going over the maxLength.
+**/
+- (unsigned)prebufferReadLengthForTerm
+{
+ if(maxLength > 0)
+ return MIN(READALL_CHUNKSIZE, (maxLength - bytesDone));
+ else
+ return READALL_CHUNKSIZE;
+}
+
+/**
+ * For read packets with a set terminator, scans the packet buffer for the term.
+ * It is assumed the terminator had not been fully read prior to the new bytes.
+ *
+ * If the term is found, the number of excess bytes after the term are returned.
+ * If the term is not found, this method will return -1.
+ *
+ * Note: A return value of zero means the term was found at the very end.
+**/
+- (CFIndex)searchForTermAfterPreBuffering:(CFIndex)numBytes
+{
+ NSAssert(term != nil, @"Searching for term in data when there is no term.");
+
+ // We try to start the search such that the first new byte read matches up with the last byte of the term.
+ // We continue searching forward after this until the term no longer fits into the buffer.
+
+ // Note: Beware of implicit casting rules
+ // This could give you -1: MAX(0, 1 - 1 - [term length] + 1);
+
+ CFIndex i = MAX(0, (CFIndex)(bytesDone - numBytes - [term length] + 1));
+
+ while(i + [term length] <= bytesDone)
+ {
+ const void *subBuffer = [buffer bytes] + i;
+
+ if(memcmp(subBuffer, [term bytes], [term length]) == 0)
+ {
+ return bytesDone - (i + [term length]);
+ }
+
+ i++;
+ }
+
+ return -1;
+}
+
+- (void)dealloc
+{
+ [buffer release];
+ [term release];
+ [super dealloc];
+}
+
+@end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * The AsyncWritePacket encompasses the instructions for any given write.
+**/
+@interface AsyncWritePacket : NSObject
+{
+ @public
+ NSData *buffer;
+ CFIndex bytesDone;
+ long tag;
+ NSTimeInterval timeout;
+}
+- (id)initWithData:(NSData *)d timeout:(NSTimeInterval)t tag:(long)i;
+@end
+
+@implementation AsyncWritePacket
+
+- (id)initWithData:(NSData *)d timeout:(NSTimeInterval)t tag:(long)i
+{
+ if((self = [super init]))
+ {
+ buffer = [d retain];
+ timeout = t;
+ tag = i;
+ bytesDone = 0;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [buffer release];
+ [super dealloc];
+}
+
+@end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * The AsyncSpecialPacket encompasses special instructions for interruptions in the read/write queues.
+ * This class my be altered to support more than just TLS in the future.
+**/
+@interface AsyncSpecialPacket : NSObject
+{
+ @public
+ NSDictionary *tlsSettings;
+}
+- (id)initWithTLSSettings:(NSDictionary *)settings;
+@end
+
+@implementation AsyncSpecialPacket
+
+- (id)initWithTLSSettings:(NSDictionary *)settings
+{
+ if((self = [super init]))
+ {
+ tlsSettings = [settings copy];
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ [tlsSettings release];
+ [super dealloc];
+}
+
+@end
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+@implementation AsyncSocket
+
+- (id)init
+{
+ return [self initWithDelegate:nil userData:0];
+}
+
+- (id)initWithDelegate:(id)delegate
+{
+ return [self initWithDelegate:delegate userData:0];
+}
+
+// Designated initializer.
+- (id)initWithDelegate:(id)delegate userData:(long)userData
+{
+ if((self = [super init]))
+ {
+ theFlags = DEFAULT_PREBUFFERING ? kEnablePreBuffering : 0;
+ theDelegate = delegate;
+ theUserData = userData;
+
+ theSocket4 = NULL;
+ theSource4 = NULL;
+ theSocket6 = NULL;
+ theSource6 = NULL;
+ theRunLoop = NULL;
+ theReadStream = NULL;
+ theWriteStream = NULL;
+
+ theConnectTimer = nil;
+
+ theReadQueue = [[NSMutableArray alloc] initWithCapacity:READQUEUE_CAPACITY];
+ theCurrentRead = nil;
+ theReadTimer = nil;
+
+ partialReadBuffer = [[NSMutableData alloc] initWithCapacity:READALL_CHUNKSIZE];
+
+ theWriteQueue = [[NSMutableArray alloc] initWithCapacity:WRITEQUEUE_CAPACITY];
+ theCurrentWrite = nil;
+ theWriteTimer = nil;
+
+ // Socket context
+ NSAssert(sizeof(CFSocketContext) == sizeof(CFStreamClientContext), @"CFSocketContext != CFStreamClientContext");
+ theContext.version = 0;
+ theContext.info = self;
+ theContext.retain = nil;
+ theContext.release = nil;
+ theContext.copyDescription = nil;
+
+ // Default run loop modes
+ theRunLoopModes = [[NSArray arrayWithObject:NSDefaultRunLoopMode] retain];
+ }
+ return self;
+}
+
+// The socket may been initialized in a connected state and auto-released, so this should close it down cleanly.
+- (void)dealloc
+{
+ [self close];
+ [theReadQueue release];
+ [theWriteQueue release];
+ [theRunLoopModes release];
+ [partialReadBuffer release];
+ [NSObject cancelPreviousPerformRequestsWithTarget:self];
+ [super dealloc];
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Accessors
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (long)userData
+{
+ return theUserData;
+}
+
+- (void)setUserData:(long)userData
+{
+ theUserData = userData;
+}
+
+- (id)delegate
+{
+ return theDelegate;
+}
+
+- (void)setDelegate:(id)delegate
+{
+ theDelegate = delegate;
+}
+
+- (BOOL)canSafelySetDelegate
+{
+ return ([theReadQueue count] == 0 && [theWriteQueue count] == 0 && theCurrentRead == nil && theCurrentWrite == nil);
+}
+
+- (CFSocketRef)getCFSocket
+{
+ if(theSocket4)
+ return theSocket4;
+ else
+ return theSocket6;
+}
+
+- (CFReadStreamRef)getCFReadStream
+{
+ return theReadStream;
+}
+
+- (CFWriteStreamRef)getCFWriteStream
+{
+ return theWriteStream;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Progress
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (float)progressOfReadReturningTag:(long *)tag bytesDone:(CFIndex *)done total:(CFIndex *)total
+{
+ // Check to make sure we're actually reading something right now,
+ // and that the read packet isn't an AsyncSpecialPacket (upgrade to TLS).
+ if (!theCurrentRead || ![theCurrentRead isKindOfClass:[AsyncReadPacket class]]) return NAN;
+
+ // It's only possible to know the progress of our read if we're reading to a certain length
+ // If we're reading to data, we of course have no idea when the data will arrive
+ // If we're reading to timeout, then we have no idea when the next chunk of data will arrive.
+ BOOL hasTotal = (theCurrentRead->readAllAvailableData == NO && theCurrentRead->term == nil);
+
+ CFIndex d = theCurrentRead->bytesDone;
+ CFIndex t = hasTotal ? [theCurrentRead->buffer length] : 0;
+ if (tag != NULL) *tag = theCurrentRead->tag;
+ if (done != NULL) *done = d;
+ if (total != NULL) *total = t;
+ float ratio = (float)d/(float)t;
+ return isnan(ratio) ? 1.0F : ratio; // 0 of 0 bytes is 100% done.
+}
+
+- (float)progressOfWriteReturningTag:(long *)tag bytesDone:(CFIndex *)done total:(CFIndex *)total
+{
+ // Check to make sure we're actually writing something right now,
+ // and that the write packet isn't an AsyncSpecialPacket (upgrade to TLS).
+ if (!theCurrentWrite || ![theCurrentWrite isKindOfClass:[AsyncWritePacket class]]) return NAN;
+
+ CFIndex d = theCurrentWrite->bytesDone;
+ CFIndex t = [theCurrentWrite->buffer length];
+ if (tag != NULL) *tag = theCurrentWrite->tag;
+ if (done != NULL) *done = d;
+ if (total != NULL) *total = t;
+ return (float)d/(float)t;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Run Loop
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (void)runLoopAddSource:(CFRunLoopSourceRef)source
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFRunLoopAddSource(theRunLoop, source, runLoopMode);
+ }
+}
+
+- (void)runLoopRemoveSource:(CFRunLoopSourceRef)source
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFRunLoopRemoveSource(theRunLoop, source, runLoopMode);
+ }
+}
+
+- (void)runLoopAddTimer:(NSTimer *)timer
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFRunLoopAddTimer(theRunLoop, (CFRunLoopTimerRef)timer, runLoopMode);
+ }
+}
+
+- (void)runLoopRemoveTimer:(NSTimer *)timer
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFRunLoopRemoveTimer(theRunLoop, (CFRunLoopTimerRef)timer, runLoopMode);
+ }
+}
+
+- (void)runLoopUnscheduleReadStream
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFReadStreamUnscheduleFromRunLoop(theReadStream, theRunLoop, runLoopMode);
+ }
+ CFReadStreamSetClient(theReadStream, kCFStreamEventNone, NULL, NULL);
+}
+
+- (void)runLoopUnscheduleWriteStream
+{
+ unsigned i, count = [theRunLoopModes count];
+ for(i = 0; i < count; i++)
+ {
+ CFStringRef runLoopMode = (CFStringRef)[theRunLoopModes objectAtIndex:i];
+ CFWriteStreamUnscheduleFromRunLoop(theWriteStream, theRunLoop, runLoopMode);
+ }
+ CFWriteStreamSetClient(theWriteStream, kCFStreamEventNone, NULL, NULL);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Configuration
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * See the header file for a full explanation of pre-buffering.
+**/
+- (void)enablePreBuffering
+{
+ theFlags |= kEnablePreBuffering;
+}
+
+/**
+ * See the header file for a full explanation of this method.
+**/
+- (BOOL)moveToRunLoop:(NSRunLoop *)runLoop
+{
+ NSAssert((theRunLoop == NULL) || (theRunLoop == CFRunLoopGetCurrent()),
+ @"moveToRunLoop must be called from within the current RunLoop!");
+
+ if(runLoop == nil)
+ {
+ return NO;
+ }
+ if(theRunLoop == [runLoop getCFRunLoop])
+ {
+ return YES;
+ }
+
+ [NSObject cancelPreviousPerformRequestsWithTarget:self];
+ theFlags &= ~kDequeueReadScheduled;
+ theFlags &= ~kDequeueWriteScheduled;
+
+ if(theReadStream && theWriteStream)
+ {
+ [self runLoopUnscheduleReadStream];
+ [self runLoopUnscheduleWriteStream];
+ }
+
+ if(theSource4) [self runLoopRemoveSource:theSource4];
+ if(theSource6) [self runLoopRemoveSource:theSource6];
+
+ // We do not retain the timers - they get retained by the runloop when we add them as a source.
+ // Since we're about to remove them as a source, we retain now, and release again below.
+ [theReadTimer retain];
+ [theWriteTimer retain];
+
+ if(theReadTimer) [self runLoopRemoveTimer:theReadTimer];
+ if(theWriteTimer) [self runLoopRemoveTimer:theWriteTimer];
+
+ theRunLoop = [runLoop getCFRunLoop];
+
+ if(theReadTimer) [self runLoopAddTimer:theReadTimer];
+ if(theWriteTimer) [self runLoopAddTimer:theWriteTimer];
+
+ // Release timers since we retained them above
+ [theReadTimer release];
+ [theWriteTimer release];
+
+ if(theSource4) [self runLoopAddSource:theSource4];
+ if(theSource6) [self runLoopAddSource:theSource6];
+
+ if(theReadStream && theWriteStream)
+ {
+ if(![self attachStreamsToRunLoop:runLoop error:nil])
+ {
+ return NO;
+ }
+ }
+
+ [runLoop performSelector:@selector(maybeDequeueRead) target:self argument:nil order:0 modes:theRunLoopModes];
+ [runLoop performSelector:@selector(maybeDequeueWrite) target:self argument:nil order:0 modes:theRunLoopModes];
+ [runLoop performSelector:@selector(maybeScheduleDisconnect) target:self argument:nil order:0 modes:theRunLoopModes];
+
+ return YES;
+}
+
+/**
+ * See the header file for a full explanation of this method.
+**/
+- (BOOL)setRunLoopModes:(NSArray *)runLoopModes
+{
+ NSAssert((theRunLoop == NULL) || (theRunLoop == CFRunLoopGetCurrent()),
+ @"setRunLoopModes must be called from within the current RunLoop!");
+
+ if([runLoopModes count] == 0)
+ {
+ return NO;
+ }
+ if([theRunLoopModes isEqualToArray:runLoopModes])
+ {
+ return YES;
+ }
+
+ [NSObject cancelPreviousPerformRequestsWithTarget:self];
+ theFlags &= ~kDequeueReadScheduled;
+ theFlags &= ~kDequeueWriteScheduled;
+
+ if(theReadStream && theWriteStream)
+ {
+ [self runLoopUnscheduleReadStream];
+ [self runLoopUnscheduleWriteStream];
+ }
+
+ if(theSource4) [self runLoopRemoveSource:theSource4];
+ if(theSource6) [self runLoopRemoveSource:theSource6];
+
+ // We do not retain the timers - they get retained by the runloop when we add them as a source.
+ // Since we're about to remove them as a source, we retain now, and release again below.
+ [theReadTimer retain];
+ [theWriteTimer retain];
+
+ if(theReadTimer) [self runLoopRemoveTimer:theReadTimer];
+ if(theWriteTimer) [self runLoopRemoveTimer:theWriteTimer];
+
+ [theRunLoopModes release];
+ theRunLoopModes = [runLoopModes copy];
+
+ if(theReadTimer) [self runLoopAddTimer:theReadTimer];
+ if(theWriteTimer) [self runLoopAddTimer:theWriteTimer];
+
+ // Release timers since we retained them above
+ [theReadTimer release];
+ [theWriteTimer release];
+
+ if(theSource4) [self runLoopAddSource:theSource4];
+ if(theSource6) [self runLoopAddSource:theSource6];
+
+ if(theReadStream && theWriteStream)
+ {
+ // Note: theRunLoop variable is a CFRunLoop, and NSRunLoop is NOT toll-free bridged with CFRunLoop.
+ // So we cannot pass theRunLoop to the method below, which is expecting a NSRunLoop parameter.
+ // Instead we pass nil, which will result in the method properly using the current run loop.
+
+ if(![self attachStreamsToRunLoop:nil error:nil])
+ {
+ return NO;
+ }
+ }
+
+ [self performSelector:@selector(maybeDequeueRead) withObject:nil afterDelay:0 inModes:theRunLoopModes];
+ [self performSelector:@selector(maybeDequeueWrite) withObject:nil afterDelay:0 inModes:theRunLoopModes];
+ [self performSelector:@selector(maybeScheduleDisconnect) withObject:nil afterDelay:0 inModes:theRunLoopModes];
+
+ return YES;
+}
+
+- (NSArray *)runLoopModes
+{
+ return [[theRunLoopModes retain] autorelease];
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Accepting
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+- (BOOL)acceptOnPort:(UInt16)port error:(NSError **)errPtr
+{
+ return [self acceptOnInterface:nil port:port error:errPtr];
+}
+
+/**
+ * To accept on a certain interface, pass the address to accept on.
+ * To accept on any interface, pass nil or an empty string.
+ * To accept only connections from localhost pass "localhost" or "loopback".
+**/
+- (BOOL)acceptOnInterface:(NSString *)interface port:(UInt16)port error:(NSError **)errPtr
+{
+ if (theDelegate == NULL)
+ {
+ [NSException raise:AsyncSocketException
+ format:@"Attempting to accept without a delegate. Set a delegate first."];
+ }
+
+ if (theSocket4 != NULL || theSocket6 != NULL)
+ {
+ [NSException raise:AsyncSocketException
+ format:@"Attempting to accept while connected or accepting connections. Disconnect first."];
+ }
+
+ // Set up the listen sockaddr structs if needed.
+
+ NSData *address4 = nil, *address6 = nil;
+ if(interface == nil || ([interface length] == 0))
+ {
+ // Accept on ANY address
+ struct sockaddr_in nativeAddr4;
+ nativeAddr4.sin_len = sizeof(struct sockaddr_in);
+ nativeAddr4.sin_family = AF_INET;
+ nativeAddr4.sin_port = htons(port);
+ nativeAddr4.sin_addr.s_addr = htonl(INADDR_ANY);
+ memset(&(nativeAddr4.sin_zero), 0, sizeof(nativeAddr4.sin_zero));
+
+ struct sockaddr_in6 nativeAddr6;
+ nativeAddr6.sin6_len = sizeof(struct sockaddr_in6);
+ nativeAddr6.sin6_family = AF_INET6;
+ nativeAddr6.sin6_port = htons(port);
+ nativeAddr6.sin6_flowinfo = 0;
+ nativeAddr6.sin6_addr = in6addr_any;
+ nativeAddr6.sin6_scope_id = 0;
+
+ // Wrap the native address structures for CFSocketSetAddress.
+ address4 = [NSData dataWithBytes:&nativeAddr4 length:sizeof(nativeAddr4)];
+ address6 = [NSData dataWithBytes:&nativeAddr6 length:sizeof(nativeAddr6)];
+ }
+ else if([interface isEqualToString:@"localhost"] || [interface isEqualToString:@"loopback"])
+ {
+ // Accept only on LOOPBACK address
+ struct sockaddr_in nativeAddr4;
+ nativeAddr4.sin_len = sizeof(struct sockaddr_in);
+ nativeAddr4.sin_family = AF_INET;
+ nativeAddr4.sin_port = htons(port);
+ nativeAddr4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ memset(&(nativeAddr4.sin_zero), 0, sizeof(nativeAddr4.sin_zero));
+
+ struct sockaddr_in6 nativeAddr6;
+ nativeAddr6.sin6_len = sizeof(struct sockaddr_in6);
+ nativeAddr6.sin6_family = AF_INET6;
+ nativeAddr6.sin6_port = htons(port);
+ nativeAddr6.sin6_flowinfo = 0;
+ nativeAddr6.sin6_addr = in6addr_loopback;
+ nativeAddr6.sin6_scope_id = 0;
+
+ // Wrap the native address structures for CFSocketSetAddress.
+ address4 = [NSData dataWithBytes:&nativeAddr4 length:sizeof(nativeAddr4)];
+ address6 = [NSData dataWithBytes:&nativeAddr6 length:sizeof(nativeAddr6)];
+ }
+ else
+ {
+ NSString *portStr = [NSString stringWithFormat:@"%hu", port];
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
+ @synchronized (getaddrinfoLock)
+#endif
+ {
+ struct addrinfo hints, *res, *res0;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = IPPROTO_TCP;
+ hints.ai_flags = AI_PASSIVE;
+
+ int error = getaddrinfo([interface UTF8String], [portStr UTF8String], &hints, &res0);
+
+ if(error)
+ {
+ if(errPtr)
+ {
+ NSString *errMsg = [NSString stringWithCString:gai_strerror(error) encoding:NSASCIIStringEncoding];
+ NSDictionary *info = [NSDictionary dictionaryWithObject:errMsg forKey:NSLocalizedDescriptionKey];
+
+ *errPtr = [NSError errorWithDomain:@"kCFStreamErrorDomainNetDB" code:error userInfo:info];
+ }
+ }
+
+ for(res = res0; res; res = res->ai_next)
+ {
+ if(!address4 && (res->ai_family == AF_INET))
+ {
+ // Found IPv4 address
+ // Wrap the native address structures for CFSocketSetAddress.
+ address4 = [NSData dataWithBytes:res->ai_addr length:res->ai_addrlen];
+ }
+ else if(!address6 && (res->ai_family == AF_INET6))
+ {
+ // Found IPv6 address
+ // Wrap the native address structures for CFSocketSetAddress.
+ address6 = [NSData dataWithBytes:res->ai_addr length:res->ai_addrlen];
+ }
+ }
+ freeaddrinfo(res0);
+ }
+
+ if(!address4 && !address6) return NO;
+ }
+
+ // Create the sockets.
+
+ if (address4)
+ {
+ theSocket4 = [self newAcceptSocketForAddress:address4 error:errPtr];
+ if (theSocket4 == NULL) goto Failed;
+ }
+
+ if (address6)
+ {
+ theSocket6 = [self newAcceptSocketForAddress:address6 error:errPtr];
+
+ // Note: The iPhone doesn't currently support IPv6
+
+#if !TARGET_OS_IPHONE
+ if (theSocket6 == NULL) goto Failed;
+#endif
+ }
+
+ // Attach the sockets to the run loop so that callback methods work
+
+ [self attachSocketsToRunLoop:nil error:nil];
+
+ // Set the SO_REUSEADDR flags.
+
+ int reuseOn = 1;
+ if (theSocket4) setsockopt(CFSocketGetNative(theSocket4), SOL_SOCKET, SO_REUSEADDR, &reuseOn, sizeof(reuseOn));
+ if (theSocket6) setsockopt(CFSocketGetNative(theSocket6), SOL_SOCKET, SO_REUSEADDR, &reuseOn, sizeof(reuseOn));
+
+ // Set the local bindings which causes the sockets to start listening.
+
+ CFSocketError err;
+ if (theSocket4)
+ {
+ err = CFSocketSetAddress (theSocket4, (CFDataRef)address4);
+ if (err != kCFSocketSuccess) goto Failed;
+
+ //NSLog(@"theSocket4: %hu", [self localPort:theSocket4]);
+ }
+
+ if(port == 0 && theSocket4 && theSocket6)
+ {
+ // The user has passed in port 0, which means he wants to allow the kernel to choose the port for them
+ // However, the kernel will choose a different port for both theSocket4 and theSocket6
+ // So we grab the port the kernel choose for theSocket4, and set it as the port for theSocket6
+ UInt16 chosenPort = [self localPort:theSocket4];
+
+ struct sockaddr_in6 *pSockAddr6 = (struct sockaddr_in6 *)[address6 bytes];
+ pSockAddr6->sin6_port = htons(chosenPort);
+ }
+
+ if (theSocket6)
+ {
+ err = CFSocketSetAddress (theSocket6, (CFDataRef)address6);
+ if (err != kCFSocketSuccess) goto Failed;
+
+ //NSLog(@"theSocket6: %hu", [self localPort:theSocket6]);
+ }
+
+ theFlags |= kDidPassConnectMethod;
+ return YES;
+
+Failed:
+ if(errPtr) *errPtr = [self getSocketError];
+ if(theSocket4 != NULL)
+ {
+ CFSocketInvalidate(theSocket4);
+ CFRelease(theSocket4);
+ theSocket4 = NULL;
+ }
+ if(theSocket6 != NULL)
+ {
+ CFSocketInvalidate(theSocket6);
+ CFRelease(theSocket6);
+ theSocket6 = NULL;
+ }
+ return NO;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#pragma mark Connecting
+//