diff --git a/Joystick.xcodeproj/project.pbxproj b/Joystick.xcodeproj/project.pbxproj index a0249fe..d80ebca 100755 --- a/Joystick.xcodeproj/project.pbxproj +++ b/Joystick.xcodeproj/project.pbxproj @@ -165,6 +165,8 @@ 3048A1151C40657C00855EB0 /* DeviceState_Indeterminate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A10F1C40657C00855EB0 /* DeviceState_Indeterminate@2x.png */; }; 3048A1161C40657C00855EB0 /* DeviceState_Warning.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A1101C40657C00855EB0 /* DeviceState_Warning.png */; }; 3048A1171C40657C00855EB0 /* DeviceState_Warning@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A1111C40657C00855EB0 /* DeviceState_Warning@2x.png */; }; + 304ECCFF1C98E1B70094B7B0 /* HSpline.m in Sources */ = {isa = PBXBuildFile; fileRef = 304ECCFE1C98E1B70094B7B0 /* HSpline.m */; }; + 306991161C62C60300C9E0E4 /* CameraSettingsTimelineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 306991151C62C60300C9E0E4 /* CameraSettingsTimelineView.m */; }; 30B8EE9F1C45D0A100DCF15C /* DeviceState_Off.png in Resources */ = {isa = PBXBuildFile; fileRef = 30B8EE9D1C45D0A000DCF15C /* DeviceState_Off.png */; }; 30B8EEA01C45D0A100DCF15C /* DeviceState_Off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 30B8EE9E1C45D0A100DCF15C /* DeviceState_Off@2x.png */; }; 30B8EEA31C48924800DCF15C /* DeviceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B8EEA21C48924800DCF15C /* DeviceTableViewCell.m */; }; @@ -353,7 +355,7 @@ 2362F62A19EEF1F500C85368 /* AppExecutive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = AppExecutive.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 236621071A39FA520009EB85 /* FrameRateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameRateViewController.h; sourceTree = ""; }; 236621081A39FA520009EB85 /* FrameRateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FrameRateViewController.m; sourceTree = ""; }; - 2389AC1619DD938100FB2679 /* NMX Motion 3.0.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NMX Motion 3.0.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2389AC1619DD938100FB2679 /* NMX Motion.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "NMX Motion.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2389AC1A19DD938100FB2679 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2389AC1B19DD938100FB2679 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 2389AC1D19DD938100FB2679 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -403,6 +405,10 @@ 3048A10F1C40657C00855EB0 /* DeviceState_Indeterminate@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Indeterminate@2x.png"; sourceTree = ""; }; 3048A1101C40657C00855EB0 /* DeviceState_Warning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceState_Warning.png; sourceTree = ""; }; 3048A1111C40657C00855EB0 /* DeviceState_Warning@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Warning@2x.png"; sourceTree = ""; }; + 304ECCFD1C98E1B70094B7B0 /* HSpline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSpline.h; sourceTree = ""; }; + 304ECCFE1C98E1B70094B7B0 /* HSpline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSpline.m; sourceTree = ""; }; + 306991141C62C60300C9E0E4 /* CameraSettingsTimelineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraSettingsTimelineView.h; sourceTree = ""; }; + 306991151C62C60300C9E0E4 /* CameraSettingsTimelineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraSettingsTimelineView.m; sourceTree = ""; }; 30B8EE9D1C45D0A000DCF15C /* DeviceState_Off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceState_Off.png; sourceTree = ""; }; 30B8EE9E1C45D0A100DCF15C /* DeviceState_Off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Off@2x.png"; sourceTree = ""; }; 30B8EEA11C48924800DCF15C /* DeviceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewCell.h; sourceTree = ""; }; @@ -632,7 +638,7 @@ 2389AC1719DD938100FB2679 /* Products */ = { isa = PBXGroup; children = ( - 2389AC1619DD938100FB2679 /* NMX Motion 3.0.app */, + 2389AC1619DD938100FB2679 /* NMX Motion.app */, ); name = Products; sourceTree = ""; @@ -640,6 +646,7 @@ 2389AC1819DD938100FB2679 /* Joystick */ = { isa = PBXGroup; children = ( + 304ECCFC1C98E1250094B7B0 /* Utilities */, 10F9DE341BEBC1B00059A727 /* reachability */, 10F9DE221BEBC0B40059A727 /* imagepicker */, 10D5EBB61B94CEE2006125E1 /* assets */, @@ -690,6 +697,15 @@ name = "Supporting Files"; sourceTree = ""; }; + 304ECCFC1C98E1250094B7B0 /* Utilities */ = { + isa = PBXGroup; + children = ( + 304ECCFD1C98E1B70094B7B0 /* HSpline.h */, + 304ECCFE1C98E1B70094B7B0 /* HSpline.m */, + ); + name = Utilities; + sourceTree = ""; + }; 3F51E8AC1B66A69400E1E2D5 /* TestFairy */ = { isa = PBXGroup; children = ( @@ -805,6 +821,8 @@ children = ( 5D25BC641A5B862B00F324AD /* DeviceSettingsViewController.h */, 5D25BC651A5B862B00F324AD /* DeviceSettingsViewController.m */, + 306991141C62C60300C9E0E4 /* CameraSettingsTimelineView.h */, + 306991151C62C60300C9E0E4 /* CameraSettingsTimelineView.m */, 23FD81061A23D78800FD9D49 /* CameraSettingsViewController.h */, 23FD81071A23D78800FD9D49 /* CameraSettingsViewController.m */, 23C72C741A1FC20400DF1002 /* MotorSettingsViewController.h */, @@ -891,7 +909,7 @@ ); name = "NMX Motion"; productName = Joystick; - productReference = 2389AC1619DD938100FB2679 /* NMX Motion 3.0.app */; + productReference = 2389AC1619DD938100FB2679 /* NMX Motion.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -901,7 +919,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0600; - ORGANIZATIONNAME = "Mark Zykin"; + ORGANIZATIONNAME = "Dynamic Perception"; TargetAttributes = { 2389AC1519DD938100FB2679 = { CreatedOnToolsVersion = 6.0.1; @@ -1121,6 +1139,7 @@ 2389AC4419DDB56800FB2679 /* JoystickView.m in Sources */, 23F95D981A24CE8300E3D7DA /* JoyButton.m in Sources */, 23EEAD291A44D0BE006EC15C /* IntervalViewController.m in Sources */, + 304ECCFF1C98E1B70094B7B0 /* HSpline.m in Sources */, 5D5C2F781A644C6A0009FE8A /* NSNumber+ASI.m in Sources */, 236621091A39FA520009EB85 /* FrameRateViewController.m in Sources */, 5DAEBE5119F6080A000AC7AA /* DeviceSelectionTableViewController.m in Sources */, @@ -1136,6 +1155,7 @@ 30B8EEA31C48924800DCF15C /* DeviceTableViewCell.m in Sources */, 10CF71D31BC388E3004ED48C /* HelpViewController.m in Sources */, 3FB4A5671B61F0B4006CFF1F /* NotificationTest.m in Sources */, + 306991161C62C60300C9E0E4 /* CameraSettingsTimelineView.m in Sources */, 10F9DE331BEBC0C20059A727 /* ELCImagePickerController.m in Sources */, 3FB4A55E1B5FF154006CFF1F /* GraphView.m in Sources */, 106615831BA1CF1900A85529 /* LinearRotaryViewController.m in Sources */, @@ -1294,7 +1314,7 @@ "\"UIKit\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.dynamicpercption.nmxcontroller; - PRODUCT_NAME = "$(TARGET_NAME) 3.0"; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1337,7 +1357,7 @@ "\"UIKit\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.dynamicpercption.nmxcontroller; - PRODUCT_NAME = "$(TARGET_NAME) 3.0"; + PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "$(BUILD_ROOT)/../IntermediateBuildFilesPath/UninstalledProducts/include"; diff --git a/Joystick.xcworkspace/contents.xcworkspacedata b/Joystick.xcworkspace/contents.xcworkspacedata index 7eee62d..5587135 100755 --- a/Joystick.xcworkspace/contents.xcworkspacedata +++ b/Joystick.xcworkspace/contents.xcworkspacedata @@ -1,12 +1,6 @@ - - - - diff --git a/Joystick/AppExecutive.h b/Joystick/AppExecutive.h index 94204fa..e4cdf0b 100755 --- a/Joystick/AppExecutive.h +++ b/Joystick/AppExecutive.h @@ -67,9 +67,9 @@ @property int startPoint3; @property int endPoint3; -@property int microstep1; -@property int microstep2; -@property int microstep3; +@property (nonatomic) int microstep1; +@property (nonatomic) int microstep2; +@property (nonatomic) int microstep3; @property int stopMicrostep1; @property int stopMicrostep2; @@ -167,9 +167,13 @@ #pragma mark Object Operations -- (void) resetFocusTime; -- (void) resetTriggerTime; -- (void) computeDelayTime; - (void) setPoints; +#pragma mark validation + +- (BOOL) validExposureNumber: (NSNumber *) number; +- (BOOL) validDelayNumber: (NSNumber *) number; +- (BOOL) validFocusNumber: (NSNumber *) number; +- (BOOL) validTriggerNumber: (NSNumber *) number; + @end diff --git a/Joystick/AppExecutive.m b/Joystick/AppExecutive.m index e470907..d244c27 100755 --- a/Joystick/AppExecutive.m +++ b/Joystick/AppExecutive.m @@ -102,6 +102,10 @@ @implementation AppExecutive NSString static *kDefaultsSlideIncreaseValues = @"kDefaultsSlideIncreaseValues"; NSString static *kDefaultsSlideDecreaseValues = @"kDefaultsSlideDecreaseValues"; +#define kDefaultsMotorSledMicrosteps @"MotorSledMicrosteps" +#define kDefaultsMotorPanMicrosteps @"MotorPanMicrosteps" +#define kDefaultsMotorTiltMicrosteps @"MotorTiltMicrosteps" + #pragma mark Public Property Synthesis @@ -137,13 +141,16 @@ @implementation AppExecutive @synthesize slideIncreaseValues; @synthesize slideDecreaseValues; +@synthesize microstep1 = _microstep1; +@synthesize microstep2 = _microstep2; +@synthesize microstep3 = _microstep3; #pragma mark Private Property Synthesis @synthesize defaults; @synthesize forFrameRate; -@synthesize selectedMotorFrame, startPoint1,endPoint1, startPoint2,endPoint2, startPoint3, endPoint3, microstep1, microstep2, microstep3, stopMicrostep1, stopMicrostep2, stopMicrostep3, motor2MicrostepChanged,motor3MicrostepChanged, appBlueColor, is3P,slide3PVal1,slide3PVal3,slide3PVal2,pan3PVal1,pan3PVal2,pan3PVal3,tilt3PVal1,tilt3PVal2,tilt3PVal3,slideGear,slideMotor,panGear,panMotor,tiltGear,tiltMotor,midSet,start3PSlideDistance,start3PPanDistance,start3PTiltDistance,mid3PSlideDistance,mid3PPanDistance,mid3PTiltDistance,end3PSlideDistance,end3PPanDistance,end3PTiltDistance,useJoystick,start3PSet,mid3PSet,end3PSet,isContinuous,voltageHigh,voltageLow,voltage,scaledEnd3PPanDistance,scaledMid3PPanDistance,scaledStart3PPanDistance,scaledEnd3PSlideDistance,scaledEnd3PTiltDistance,scaledMid3PSlideDistance,scaledMid3PTiltDistance,scaledStart3PSlideDistance,scaledStart3PTiltDistance,isVideo,printTilt,dampening1,dampening2,dampening3,resetController; +@synthesize selectedMotorFrame, startPoint1,endPoint1, startPoint2,endPoint2, startPoint3, endPoint3, stopMicrostep1, stopMicrostep2, stopMicrostep3, motor2MicrostepChanged,motor3MicrostepChanged, appBlueColor, is3P,slide3PVal1,slide3PVal3,slide3PVal2,pan3PVal1,pan3PVal2,pan3PVal3,tilt3PVal1,tilt3PVal2,tilt3PVal3,slideGear,slideMotor,panGear,panMotor,tiltGear,tiltMotor,midSet,start3PSlideDistance,start3PPanDistance,start3PTiltDistance,mid3PSlideDistance,mid3PPanDistance,mid3PTiltDistance,end3PSlideDistance,end3PPanDistance,end3PTiltDistance,useJoystick,start3PSet,mid3PSet,end3PSet,isContinuous,voltageHigh,voltageLow,voltage,scaledEnd3PPanDistance,scaledMid3PPanDistance,scaledStart3PPanDistance,scaledEnd3PSlideDistance,scaledEnd3PTiltDistance,scaledMid3PSlideDistance,scaledMid3PTiltDistance,scaledStart3PSlideDistance,scaledStart3PTiltDistance,isVideo,printTilt,dampening1,dampening2,dampening3,resetController; //------------------------------------------------------------------------------ @@ -171,23 +178,6 @@ - (NSNumber *) exposureNumber { return exposureNumber; } -- (void) setExposureNumber: (NSNumber *) number { - - //NSLog(@"setExposureNumber"); - - if (FALSE == [number isEqualToNumber: self.exposureNumber]) - { - if ([self validExposureNumber: number]) - { - exposureNumber = number; - - [self computeBufferTime]; - [self computeIntervalTime]; - [self saveValue: exposureNumber forKey: kDefaultsExposure]; - } - } -} - - (NSNumber *) bufferNumber { if (bufferNumber == nil) @@ -204,6 +194,16 @@ - (NSNumber *) bufferNumber { return bufferNumber; } +- (void) setBufferNumber: (NSNumber *) number { + + if (FALSE == [number isEqualToNumber: self.bufferNumber]) + { + bufferNumber = number; + [self saveValue: bufferNumber forKey: kDefaultsBuffer]; + } +} + + - (NSNumber *) shotDurationNumber { if (shotDurationNumber == nil) @@ -351,8 +351,6 @@ - (void) setTriggerNumber: (NSNumber *) number { if ([self validTriggerNumber: number]) { triggerNumber = number; - [self computeExposure]; - [self computeBufferTime]; [self saveValue: triggerNumber forKey: kDefaultsTrigger]; } } @@ -374,19 +372,25 @@ - (NSNumber *) delayNumber { return delayNumber; } + - (void) setDelayNumber: (NSNumber *) number { if (FALSE == [number isEqualToNumber: self.delayNumber]) { - if ([self validDelayNumber: number]) - { - delayNumber = number; - [self computeExposure]; - [self computeBufferTime]; - [self saveValue: delayNumber forKey: kDefaultsDelay]; - } - } + delayNumber = number; + [self saveValue: delayNumber forKey: kDefaultsDelay]; + } } + + - (void) setExposureNumber: (NSNumber *) number { + + if (FALSE == [number isEqualToNumber: self.exposureNumber]) + { + exposureNumber = number; + [self saveValue: exposureNumber forKey: kDefaultsExposure]; + } + } + - (NSNumber *) focusNumber { @@ -411,16 +415,6 @@ - (void) setFocusNumber: (NSNumber *) number { if ([self validFocusNumber: number]) { focusNumber = number; - - NSLog(@"setFocusNumber focusNumber: %@",focusNumber); - -// if(focusNumber < 0) -// { -// focusNumber = [NSNumber numberWithFloat:.1]; -// } - - [self computeExposure]; - [self computeBufferTime]; [self saveValue: focusNumber forKey: kDefaultsFocus]; } } @@ -449,8 +443,8 @@ - (void) setIntervalNumber: (NSNumber *) number { if ([self validIntervalNumber: number]) { intervalNumber = number; - [self computeShotDuration]; // computes frameCount if changed - [self computeBufferTime]; + [self computeShotDuration]; // computes frameCount if changed + [self saveValue: intervalNumber forKey: kDefaultsInterval]; } } @@ -691,15 +685,6 @@ - (id) init { { self.forFrameRate = DidSetNeither; // TODO: set but not used - //NSLog(@"init"); - - [self computeBufferTime]; - [self computeIntervalTime]; - [self computeShotDuration]; - [self computeFrameCountForShotDurationAndInterval]; - [self computeVideoLength]; - [self computeDelayTime]; - if (getenv("CLEAR_DEVICE_HANDLES")) { [self.defaults removeObjectForKey: kDefaultsDeviceHandles]; @@ -775,60 +760,6 @@ - (NSString *) stringWithHandleForDeviceName: (NSString *) deviceName { #pragma mark - Object Operations -- (void) computeExposure { - - NSInteger focus = [self.focusNumber integerValue]; - NSInteger trigger = [self.triggerNumber integerValue]; - NSInteger delay = [self.delayNumber integerValue]; - NSInteger exposure = focus + trigger + delay; - - self.exposureNumber = [NSNumber numberWithInteger: exposure]; -} - -- (void) computeBufferTime { - - //DDLogDebug(@"computeBufferTime"); - - NSInteger exposure = [self.exposureNumber integerValue]; - NSInteger interval = [self.intervalNumber integerValue]; - NSInteger buffer = interval - exposure; - - if (buffer < 100) - { - buffer = 100; - interval = exposure + buffer; - self.bufferNumber = [NSNumber numberWithInteger: buffer]; - self.intervalNumber = [NSNumber numberWithInteger: interval]; - - [self intervalChangedAlert]; - } - else - { - self.bufferNumber = [NSNumber numberWithInteger: buffer]; - } -} - -- (void) intervalChangedAlert { - - UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Interval Setting" - message: @"Interval has been changed to maintain minimum buffer time." - delegate: self - cancelButtonTitle: @"OK" - otherButtonTitles: nil]; - [alert show]; -} - -- (void) computeIntervalTime { - - //DDLogDebug(@"computeIntervalTime"); - - NSInteger exposure = [self.exposureNumber integerValue]; - NSInteger buffer = [self.bufferNumber integerValue]; - NSInteger interval = exposure + buffer; - - self.intervalNumber = [NSNumber numberWithInteger: interval]; -} - - (void) computeShotDuration { //DDLogDebug(@"computeShotDuration"); @@ -874,61 +805,6 @@ - (void) computeVideoLength { self.videoLengthNumber = [NSNumber numberWithInteger: videoLength]; } -- (void) computeDelayTime { - - //DDLogDebug(@"computeDelayTime"); - - NSInteger exposure = [self.exposureNumber integerValue]; - NSInteger focus = [self.focusNumber integerValue]; - NSInteger trigger = [self.triggerNumber integerValue]; - - NSInteger delay = exposure - (focus + trigger); - - if (delay < 100) - { - delay = 100; - focus = exposure - (delay + trigger); - focusNumber = [NSNumber numberWithInteger: focus]; - } - - //randall 8-12-15 - - //NSLog(@"computeDelayTime focusNumber before: %@",focusNumber); - - int fn = (int)[focusNumber integerValue]; - - if(fn < 100) - { - //NSLog(@"change it"); - focusNumber = [NSNumber numberWithInteger: 100]; - } - - //NSLog(@"computeDelayTime focusNumber after: %@",focusNumber); - - //end - - - - self.delayNumber = [NSNumber numberWithInteger: delay]; -} - -- (void) resetFocusTime { - - //DDLogDebug(@"resetFocusTime"); - - focusNumber = [NSNumber numberWithInteger: defaultFocusTime]; // bypass setter to avoid recomputing exposure - [self computeDelayTime]; -} - -- (void) resetTriggerTime { - - //DDLogDebug(@"resetTriggerTime"); - - triggerNumber = [NSNumber numberWithInteger: defaultTriggerTime]; // bypass setter to avoid recomputing exposure - [self computeDelayTime]; -} - - //------------------------------------------------------------------------------ #pragma mark - Value Validation @@ -1100,8 +976,6 @@ - (void) restoreDefaults { sensitivityNumber = [NSNumber numberWithFloat: defaultSensitivity]; [self.defaults setObject: sensitivityNumber forKey: kDefaultsSensitivity]; - [self computeDelayTime]; - //ramping values panIncreaseValues = defaultRampingValues(); @@ -1161,5 +1035,66 @@ - (void) setPoints { // } } +- (void) setMicrostep1:(int)microstep1 +{ + _microstep1 = microstep1; + [self.defaults setInteger: microstep1 forKey: kDefaultsMotorSledMicrosteps]; + [self.defaults synchronize]; +} + +- (int) microstep1 +{ + if (_microstep1 > 0) return _microstep1; + + _microstep1 = (int)[self.defaults integerForKey: kDefaultsMotorSledMicrosteps]; + if (0 == _microstep1) + { + _microstep1 = 4; + } + + return _microstep1; +} + +- (void) setMicrostep2:(int)microstep2 +{ + _microstep2 = microstep2; + [self.defaults setInteger: microstep2 forKey: kDefaultsMotorPanMicrosteps]; + [self.defaults synchronize]; +} + +- (int) microstep2 +{ + if (_microstep2 > 0) return _microstep2; + + _microstep2 = (int)[self.defaults integerForKey: kDefaultsMotorPanMicrosteps]; + if (0 == _microstep2) + { + _microstep2 = 16; + } + + return self.microstep2; +} + +- (void) setMicrostep3:(int)microstep3 +{ + _microstep3 = microstep3; + [self.defaults setInteger: microstep3 forKey: kDefaultsMotorTiltMicrosteps]; + [self.defaults synchronize]; +} + +- (int) microstep3 +{ + if (_microstep3 > 0) return _microstep3; + + _microstep3 = (int)[self.defaults integerForKey: kDefaultsMotorTiltMicrosteps]; + if (0 == _microstep3) + { + _microstep3 = 16; + } + + return _microstep3; +} + + @end diff --git a/Joystick/BacklashViewController.m b/Joystick/BacklashViewController.m index c9cedad..2c8c548 100755 --- a/Joystick/BacklashViewController.m +++ b/Joystick/BacklashViewController.m @@ -147,12 +147,6 @@ - (IBAction) handleOkButton: (id) sender { DDLogDebug(@"Dismiss Backlash Picker Button"); -// NSInteger index = [self.picker selectedRowInComponent: 0]; -// NSNumber * number = [exposureNumbers objectAtIndex: index]; -// NSString * string = [exposureStrings objectAtIndex: index]; -// -// [self.delegate updateExposureNumber: number]; -// [self.delegate updateExposureString: string]; [self dismissViewControllerAnimated: YES completion: nil]; } diff --git a/Joystick/Base.lproj/Main.storyboard b/Joystick/Base.lproj/Main.storyboard index 47d658a..c354ba2 100755 --- a/Joystick/Base.lproj/Main.storyboard +++ b/Joystick/Base.lproj/Main.storyboard @@ -20,14 +20,14 @@ - + + + +