Skip to content

Commit 8e22497

Browse files
rabidrebeldograbidrebeldog
authored
Merge pull request #8 from DynamicPerception/multicontroller
v. 4.0 Multicontroller
2 parents 7bbb79d + 94f147b commit 8e22497

55 files changed

Lines changed: 8012 additions & 7121 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Joystick.xcodeproj/project.pbxproj‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,20 @@
159159
23F95D981A24CE8300E3D7DA /* JoyButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 23F95D971A24CE8300E3D7DA /* JoyButton.m */; };
160160
23FD81081A23D78800FD9D49 /* CameraSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FD81071A23D78800FD9D49 /* CameraSettingsViewController.m */; };
161161
23FD810B1A23D8FC00FD9D49 /* ReviewStatusViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FD810A1A23D8FC00FD9D49 /* ReviewStatusViewController.m */; };
162+
301A1BFA1CED22FA00A26D14 /* JSDeviceSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 301A1BF91CED22FA00A26D14 /* JSDeviceSettings.m */; };
163+
3035829A1D25982300C4FCC4 /* JSMotorRampingTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 303582991D25982300C4FCC4 /* JSMotorRampingTableViewCell.m */; };
162164
3048A1121C40657C00855EB0 /* DeviceState_Ready.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A10C1C40657C00855EB0 /* DeviceState_Ready.png */; };
163165
3048A1131C40657C00855EB0 /* DeviceState_Ready@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A10D1C40657C00855EB0 /* DeviceState_Ready@2x.png */; };
164166
3048A1141C40657C00855EB0 /* DeviceState_Indeterminate.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A10E1C40657C00855EB0 /* DeviceState_Indeterminate.png */; };
165167
3048A1151C40657C00855EB0 /* DeviceState_Indeterminate@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A10F1C40657C00855EB0 /* DeviceState_Indeterminate@2x.png */; };
166168
3048A1161C40657C00855EB0 /* DeviceState_Warning.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A1101C40657C00855EB0 /* DeviceState_Warning.png */; };
167169
3048A1171C40657C00855EB0 /* DeviceState_Warning@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3048A1111C40657C00855EB0 /* DeviceState_Warning@2x.png */; };
168170
304ECCFF1C98E1B70094B7B0 /* HSpline.m in Sources */ = {isa = PBXBuildFile; fileRef = 304ECCFE1C98E1B70094B7B0 /* HSpline.m */; };
171+
3052909A1D5BB19700A887CA /* JSDisconnectedDeviceVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 305290991D5BB19700A887CA /* JSDisconnectedDeviceVC.m */; };
169172
306991161C62C60300C9E0E4 /* CameraSettingsTimelineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 306991151C62C60300C9E0E4 /* CameraSettingsTimelineView.m */; };
173+
3090FC9F1D37031700EBB8F3 /* DeviceStateRunning.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090FC9D1D37031700EBB8F3 /* DeviceStateRunning.png */; };
174+
3090FCA01D37031700EBB8F3 /* DeviceStateRunning@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3090FC9E1D37031700EBB8F3 /* DeviceStateRunning@2x.png */; };
175+
309AD5FF1D08EC5B00F91CB4 /* JSDeviceSettingsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 309AD5FE1D08EC5B00F91CB4 /* JSDeviceSettingsVC.m */; };
170176
30B8EE9F1C45D0A100DCF15C /* DeviceState_Off.png in Resources */ = {isa = PBXBuildFile; fileRef = 30B8EE9D1C45D0A000DCF15C /* DeviceState_Off.png */; };
171177
30B8EEA01C45D0A100DCF15C /* DeviceState_Off@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 30B8EE9E1C45D0A100DCF15C /* DeviceState_Off@2x.png */; };
172178
30B8EEA31C48924800DCF15C /* DeviceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 30B8EEA21C48924800DCF15C /* DeviceTableViewCell.m */; };
@@ -399,6 +405,10 @@
399405
23FD81071A23D78800FD9D49 /* CameraSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraSettingsViewController.m; sourceTree = "<group>"; };
400406
23FD81091A23D8FC00FD9D49 /* ReviewStatusViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReviewStatusViewController.h; sourceTree = "<group>"; };
401407
23FD810A1A23D8FC00FD9D49 /* ReviewStatusViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReviewStatusViewController.m; sourceTree = "<group>"; };
408+
301A1BF81CED22FA00A26D14 /* JSDeviceSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeviceSettings.h; sourceTree = "<group>"; };
409+
301A1BF91CED22FA00A26D14 /* JSDeviceSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDeviceSettings.m; sourceTree = "<group>"; };
410+
303582981D25982300C4FCC4 /* JSMotorRampingTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMotorRampingTableViewCell.h; sourceTree = "<group>"; };
411+
303582991D25982300C4FCC4 /* JSMotorRampingTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSMotorRampingTableViewCell.m; sourceTree = "<group>"; };
402412
3048A10C1C40657C00855EB0 /* DeviceState_Ready.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceState_Ready.png; sourceTree = "<group>"; };
403413
3048A10D1C40657C00855EB0 /* DeviceState_Ready@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Ready@2x.png"; sourceTree = "<group>"; };
404414
3048A10E1C40657C00855EB0 /* DeviceState_Indeterminate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceState_Indeterminate.png; sourceTree = "<group>"; };
@@ -407,8 +417,14 @@
407417
3048A1111C40657C00855EB0 /* DeviceState_Warning@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Warning@2x.png"; sourceTree = "<group>"; };
408418
304ECCFD1C98E1B70094B7B0 /* HSpline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HSpline.h; sourceTree = "<group>"; };
409419
304ECCFE1C98E1B70094B7B0 /* HSpline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HSpline.m; sourceTree = "<group>"; };
420+
305290981D5BB19700A887CA /* JSDisconnectedDeviceVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDisconnectedDeviceVC.h; sourceTree = "<group>"; };
421+
305290991D5BB19700A887CA /* JSDisconnectedDeviceVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDisconnectedDeviceVC.m; sourceTree = "<group>"; };
410422
306991141C62C60300C9E0E4 /* CameraSettingsTimelineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CameraSettingsTimelineView.h; sourceTree = "<group>"; };
411423
306991151C62C60300C9E0E4 /* CameraSettingsTimelineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CameraSettingsTimelineView.m; sourceTree = "<group>"; };
424+
3090FC9D1D37031700EBB8F3 /* DeviceStateRunning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceStateRunning.png; sourceTree = "<group>"; };
425+
3090FC9E1D37031700EBB8F3 /* DeviceStateRunning@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceStateRunning@2x.png"; sourceTree = "<group>"; };
426+
309AD5FD1D08EC5B00F91CB4 /* JSDeviceSettingsVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDeviceSettingsVC.h; sourceTree = "<group>"; };
427+
309AD5FE1D08EC5B00F91CB4 /* JSDeviceSettingsVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSDeviceSettingsVC.m; sourceTree = "<group>"; };
412428
30B8EE9D1C45D0A000DCF15C /* DeviceState_Off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DeviceState_Off.png; sourceTree = "<group>"; };
413429
30B8EE9E1C45D0A100DCF15C /* DeviceState_Off@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "DeviceState_Off@2x.png"; sourceTree = "<group>"; };
414430
30B8EEA11C48924800DCF15C /* DeviceTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceTableViewCell.h; sourceTree = "<group>"; };
@@ -478,14 +494,16 @@
478494
/* End PBXFrameworksBuildPhase section */
479495

480496
/* Begin PBXGroup section */
481-
10871B651B8B99BD00B1D017 /* CoreData */ = {
497+
10871B651B8B99BD00B1D017 /* Data */ = {
482498
isa = PBXGroup;
483499
children = (
484500
10871B621B8B997400B1D017 /* NMXMotion.xcdatamodeld */,
485501
10871B6C1B8BA05E00B1D017 /* PresetOb.h */,
486502
10871B6D1B8BA05E00B1D017 /* PresetOb.m */,
503+
301A1BF81CED22FA00A26D14 /* JSDeviceSettings.h */,
504+
301A1BF91CED22FA00A26D14 /* JSDeviceSettings.m */,
487505
);
488-
name = CoreData;
506+
name = Data;
489507
sourceTree = "<group>";
490508
};
491509
10D5EBB61B94CEE2006125E1 /* assets */ = {
@@ -650,7 +668,7 @@
650668
10F9DE341BEBC1B00059A727 /* reachability */,
651669
10F9DE221BEBC0B40059A727 /* imagepicker */,
652670
10D5EBB61B94CEE2006125E1 /* assets */,
653-
10871B651B8B99BD00B1D017 /* CoreData */,
671+
10871B651B8B99BD00B1D017 /* Data */,
654672
3F51E8AC1B66A69400E1E2D5 /* TestFairy */,
655673
3FB4A5581B5FE80A006CFF1F /* Tests */,
656674
5D6A799F1B27543E00F93B71 /* MainViews */,
@@ -785,6 +803,8 @@
785803
3048A10F1C40657C00855EB0 /* DeviceState_Indeterminate@2x.png */,
786804
30B8EE9D1C45D0A000DCF15C /* DeviceState_Off.png */,
787805
30B8EE9E1C45D0A100DCF15C /* DeviceState_Off@2x.png */,
806+
3090FC9D1D37031700EBB8F3 /* DeviceStateRunning.png */,
807+
3090FC9E1D37031700EBB8F3 /* DeviceStateRunning@2x.png */,
788808
3048A1101C40657C00855EB0 /* DeviceState_Warning.png */,
789809
3048A1111C40657C00855EB0 /* DeviceState_Warning@2x.png */,
790810
3F9C16681B63D82600D7D51B /* thumbBlue@2x.png */,
@@ -819,6 +839,8 @@
819839
5D6A79A31B27558600F93B71 /* SettingsViews */ = {
820840
isa = PBXGroup;
821841
children = (
842+
303582981D25982300C4FCC4 /* JSMotorRampingTableViewCell.h */,
843+
303582991D25982300C4FCC4 /* JSMotorRampingTableViewCell.m */,
822844
5D25BC641A5B862B00F324AD /* DeviceSettingsViewController.h */,
823845
5D25BC651A5B862B00F324AD /* DeviceSettingsViewController.m */,
824846
306991141C62C60300C9E0E4 /* CameraSettingsTimelineView.h */,
@@ -861,6 +883,10 @@
861883
10CF73731BD7DCF8004ED48C /* SiderealViewController.m */,
862884
101F9B811C1740A9006DCFAA /* OverallDistanceViewController.h */,
863885
101F9B821C1740A9006DCFAA /* OverallDistanceViewController.m */,
886+
309AD5FD1D08EC5B00F91CB4 /* JSDeviceSettingsVC.h */,
887+
309AD5FE1D08EC5B00F91CB4 /* JSDeviceSettingsVC.m */,
888+
305290981D5BB19700A887CA /* JSDisconnectedDeviceVC.h */,
889+
305290991D5BB19700A887CA /* JSDisconnectedDeviceVC.m */,
864890
);
865891
name = SettingsViews;
866892
sourceTree = "<group>";
@@ -918,7 +944,7 @@
918944
2389AC0E19DD938100FB2679 /* Project object */ = {
919945
isa = PBXProject;
920946
attributes = {
921-
LastUpgradeCheck = 0600;
947+
LastUpgradeCheck = 0730;
922948
ORGANIZATIONNAME = "Dynamic Perception";
923949
TargetAttributes = {
924950
2389AC1519DD938100FB2679 = {
@@ -952,6 +978,7 @@
952978
files = (
953979
10AA77601C208053000B7249 /* dampening50.png in Resources */,
954980
10AA774E1C207B9F000B7249 /* dampening.png in Resources */,
981+
3090FC9F1D37031700EBB8F3 /* DeviceStateRunning.png in Resources */,
955982
10CF73551BD194B6004ED48C /* degree_circleTop@2x.png in Resources */,
956983
10CF72D11BC6A487004ED48C /* bl1.png in Resources */,
957984
30B8EEA01C45D0A100DCF15C /* DeviceState_Off@2x.png in Resources */,
@@ -989,6 +1016,7 @@
9891016
3F9C16641B63D4E400D7D51B /* thumb4.png in Resources */,
9901017
3048A1141C40657C00855EB0 /* DeviceState_Indeterminate.png in Resources */,
9911018
10AA774D1C207B9F000B7249 /* dampening@2x.png in Resources */,
1019+
3090FCA01D37031700EBB8F3 /* DeviceStateRunning@2x.png in Resources */,
9921020
3048A1131C40657C00855EB0 /* DeviceState_Ready@2x.png in Resources */,
9931021
10D5EBBA1B94CEEC006125E1 /* doneup1.png in Resources */,
9941022
10D5EBB91B94CEEC006125E1 /* done1.png in Resources */,
@@ -1121,7 +1149,9 @@
11211149
files = (
11221150
2389AC2219DD938100FB2679 /* MainViewController.m in Sources */,
11231151
5DAEBE5719F60D6F000AC7AA /* NMXDevice.m in Sources */,
1152+
3052909A1D5BB19700A887CA /* JSDisconnectedDeviceVC.m in Sources */,
11241153
2389AC1F19DD938100FB2679 /* AppDelegate.m in Sources */,
1154+
301A1BFA1CED22FA00A26D14 /* JSDeviceSettings.m in Sources */,
11251155
100838A21B8F88C6003823E0 /* DistancePresetViewController.m in Sources */,
11261156
3FB4A55B1B5FE84C006CFF1F /* DrawTest.m in Sources */,
11271157
2397C3E41AE96FBF001FFF60 /* MotorRampingView.m in Sources */,
@@ -1156,6 +1186,7 @@
11561186
10CF71D31BC388E3004ED48C /* HelpViewController.m in Sources */,
11571187
3FB4A5671B61F0B4006CFF1F /* NotificationTest.m in Sources */,
11581188
306991161C62C60300C9E0E4 /* CameraSettingsTimelineView.m in Sources */,
1189+
309AD5FF1D08EC5B00F91CB4 /* JSDeviceSettingsVC.m in Sources */,
11591190
10F9DE331BEBC0C20059A727 /* ELCImagePickerController.m in Sources */,
11601191
3FB4A55E1B5FF154006CFF1F /* GraphView.m in Sources */,
11611192
106615831BA1CF1900A85529 /* LinearRotaryViewController.m in Sources */,
@@ -1165,6 +1196,7 @@
11651196
10871B711B8BA7F700B1D017 /* SavePresetViewController.m in Sources */,
11661197
10F9DE2F1BEBC0C20059A727 /* ELCAlbumPickerController.m in Sources */,
11671198
5D25BC661A5B862B00F324AD /* DeviceSettingsViewController.m in Sources */,
1199+
3035829A1D25982300C4FCC4 /* JSMotorRampingTableViewCell.m in Sources */,
11681200
10871B5F1B8B94B900B1D017 /* PresetViewController.m in Sources */,
11691201
23A14CEC19E46CC500295312 /* SetupViewController.m in Sources */,
11701202
2389AC4119DD949400FB2679 /* JoystickViewController.m in Sources */,

‎Joystick/AppDelegate.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626

2727
@property UIColor *appBlue;
2828

29-
@property bool isHome;
30-
3129
@property (strong, nonatomic) Reachability *internetReachableFoo;
3230
@property (strong, nonatomic) Reachability *hostReachableFoo;
3331
@property BOOL internetActive;

‎Joystick/AppDelegate.m‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ @implementation AppDelegate
2121
@synthesize managedObjectModel = _managedObjectModel;
2222
@synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
2323

24-
@synthesize isHome,appBlue,nav,window;
24+
@synthesize appBlue,nav,window;
2525

2626
@synthesize internetActive,internetReachableFoo,hostActive,hostReachableFoo;
2727

@@ -31,9 +31,10 @@ @implementation AppDelegate
3131

3232
- (BOOL) application: (UIApplication *) application didFinishLaunchingWithOptions: (NSDictionary *) launchOptions {
3333

34-
// Override point for customization after application launch.
35-
36-
[TestFairy begin:@"ec963cd05b830146b2cf9039a57ee8bf80b07863"];
34+
#ifdef NDEBUG
35+
//only want this for test builds
36+
//[TestFairy begin:@"55f4e43d6fb82a6f2f7643f9b18803b63dbf6201"];
37+
#endif
3738

3839
[[UIApplication sharedApplication] setStatusBarStyle: UIStatusBarStyleLightContent];
3940

@@ -197,7 +198,10 @@ - (void) applicationWillResignActive: (UIApplication *) application {
197198

198199
- (void) applicationDidEnterBackground: (UIApplication *) application {
199200

200-
[AppExecutive sharedInstance].device.inBackground = YES;
201+
for (NMXDevice *device in [AppExecutive sharedInstance].deviceList)
202+
{
203+
device.inBackground = YES;
204+
}
201205

202206
NSLog(@"in background");
203207

@@ -215,7 +219,10 @@ - (void) applicationDidBecomeActive: (UIApplication *) application {
215219

216220
// 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.
217221

218-
[AppExecutive sharedInstance].device.inBackground = NO;
222+
for (NMXDevice *device in [AppExecutive sharedInstance].deviceList)
223+
{
224+
device.inBackground = NO;
225+
}
219226

220227
//NSLog(@"not in background");
221228
}

‎Joystick/AppExecutive.h‎

Lines changed: 25 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#import <UIKit/UIKit.h>
1111
#import "NMXDevice.h"
1212
#import "NMXDeviceManager.h"
13+
#import "JSDeviceSettings.h"
1314

1415
@interface AppExecutive : NSObject
1516

@@ -34,119 +35,21 @@
3435
@property (nonatomic, strong) NSNumber * intervalNumber;
3536

3637

37-
// Device Settings
38-
39-
@property (nonatomic, strong) NSNumber * lockAxisNumber;
40-
@property (nonatomic, strong) NSNumber * sensitivityNumber;
41-
42-
43-
// Ramping Settings
44-
45-
@property (nonatomic, strong) NSArray * panIncreaseValues;
46-
@property (nonatomic, strong) NSArray * panDecreaseValues;
47-
@property (nonatomic, strong) NSArray * tiltIncreaseValues;
48-
@property (nonatomic, strong) NSArray * tiltDecreaseValues;
49-
@property (nonatomic, strong) NSArray * slideIncreaseValues;
50-
@property (nonatomic, strong) NSArray * slideDecreaseValues;
51-
5238
// device
5339

54-
@property (strong, atomic) NMXDevice * device;
55-
@property (strong, atomic) NMXDeviceManager * deviceManager;
56-
@property (nonatomic, readonly) NSUserDefaults * defaults;
57-
58-
@property (nonatomic, readonly) UIColor * appBlueColor;
59-
60-
@property (strong, atomic) NSNumber *selectedMotorFrame;
61-
62-
@property int startPoint1;
63-
@property int endPoint1;
64-
@property int startPoint2;
65-
@property int endPoint2;
66-
@property int startPoint3;
67-
@property int endPoint3;
68-
69-
@property (nonatomic) int microstep1;
70-
@property (nonatomic) int microstep2;
71-
@property (nonatomic) int microstep3;
72-
73-
@property int stopMicrostep1;
74-
@property int stopMicrostep2;
75-
@property int stopMicrostep3;
76-
77-
@property BOOL motor2MicrostepChanged;
78-
@property BOOL motor3MicrostepChanged;
40+
@property (strong, atomic) NMXDevice * device;
41+
@property (strong, atomic) NMXDeviceManager * deviceManager;
42+
@property (nonatomic) NSUserDefaults * userDefaults;
43+
@property (nonatomic, readonly) JSDeviceSettings * defaults;
44+
@property (strong, atomic) NSArray<NMXDevice *> *deviceList;
7945

8046
@property BOOL is3P;
81-
@property BOOL midSet;
82-
83-
@property float slide3PVal1;
84-
@property float slide3PVal2;
85-
@property float slide3PVal3;
86-
87-
@property int pan3PVal1;
88-
@property int pan3PVal2;
89-
@property int pan3PVal3;
90-
91-
@property int tilt3PVal1;
92-
@property int tilt3PVal2;
93-
@property int tilt3PVal3;
94-
95-
@property int slideGear;
96-
@property int slideMotor;
97-
98-
@property int panGear;
99-
@property int panMotor;
100-
101-
@property int tiltGear;
102-
@property int tiltMotor;
10347

104-
@property int isHome;
48+
///////////////////////
10549

106-
@property int start3PSet;
107-
@property int mid3PSet;
108-
@property int end3PSet;
109-
110-
@property float start3PSlideDistance;
111-
@property float mid3PSlideDistance;
112-
@property float end3PSlideDistance;
113-
114-
@property float start3PPanDistance;
115-
@property float mid3PPanDistance;
116-
@property float end3PPanDistance;
117-
118-
@property float scaledStart3PSlideDistance;
119-
@property float scaledMid3PSlideDistance;
120-
@property float scaledEnd3PSlideDistance;
121-
122-
@property float scaledStart3PPanDistance;
123-
@property float scaledMid3PPanDistance;
124-
@property float scaledEnd3PPanDistance;
125-
126-
@property float scaledStart3PTiltDistance;
127-
@property float scaledMid3PTiltDistance;
128-
@property float scaledEnd3PTiltDistance;
129-
130-
@property float start3PTiltDistance;
131-
@property float mid3PTiltDistance;
132-
@property float end3PTiltDistance;
133-
134-
@property bool slideMicroUpdatedAfter;
135-
136-
137-
@property bool useJoystick;
13850
@property bool isContinuous;
13951

140-
@property float voltageLow;
141-
@property float voltageHigh;
142-
@property float voltage;
14352
@property bool isVideo;
144-
@property bool printTilt;
145-
@property float dampening1;
146-
@property float dampening2;
147-
@property float dampening3;
148-
149-
@property BOOL resetController;
15053

15154
#pragma mark Class Management
15255

@@ -156,6 +59,11 @@
15659

15760
- (id) init;
15861

62+
- (void) setActiveDevice: (NMXDevice *)device;
63+
- (JSDeviceSettings *) defaultsForDevice: (NMXDevice *) device;
64+
- (NSArray<NMXDevice *> *) connectedDeviceList;
65+
- (void) removeAllDevices;
66+
15967
#pragma mark Persistence
16068

16169
- (NSString *) nameForDeviceID: (NSString *) deviceName;
@@ -164,10 +72,6 @@
16472
- (void) restoreDefaults;
16573
- (NSNumber *) getNumberForKey: (NSString *) key;
16674

167-
#pragma mark Object Operations
168-
169-
- (void) setPoints;
170-
17175
#pragma mark validation
17276

17377
- (BOOL) validExposureNumber: (NSNumber *) number;
@@ -184,5 +88,18 @@
18488
- (void) setOriginalProgramDelay: (NSTimeInterval)delay;
18589
- (NSTimeInterval) getOriginalProgramDelay;
18690

91+
#pragma mark batch device comm
92+
93+
- (void) stopProgram;
94+
- (float) calculateVoltage: (BOOL) forCurrentDevice;
95+
- (BOOL) queryMotorFeasibility;
96+
- (void) setProgamSettings: (NMXProgramMode) programMode
97+
pingPongMode: (BOOL)pingPong
98+
duration: (UInt32) durationInMS
99+
accel: (UInt32) accelInMS
100+
fps: (NMXFPS) fps;
101+
102+
103+
187104

188105
@end

0 commit comments

Comments
 (0)