integrate new program feasibility query

DynamicPerception · Mar 28, 2016 · 975a369 · 975a369
1 parent bce1148
commit 975a369
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 8 deletions.
diff --git a/Joystick/Info.plist b/Joystick/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>10</string>
+	<string>11</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

diff --git a/Joystick/MotorRampingViewController.m b/Joystick/MotorRampingViewController.m
@@ -1552,8 +1552,28 @@ - (IBAction) handleNextButton: (UIButton *) sender {
 
             [MBProgressHUD hideHUDForView:self.view animated:YES];
 
-            [self performSegueWithIdentifier: kSegueToReviewStatusViewController sender: self];
-
+            if (appExecutive.is3P == NO)
+            {
+                if ((NO == [device motorQueryFeasibility: device.sledMotor]) ||
+                    (NO == [device motorQueryFeasibility: device.panMotor]) ||
+                    (NO == [device motorQueryFeasibility: device.tiltMotor]))
+                {
+                    UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Too Fast For Motors"
+                                                                    message: @"Reduce ramping or lead in/out time"
+                                                                   delegate: self
+                                                          cancelButtonTitle: @"OK"
+                                                          otherButtonTitles: nil];
+                    [alert show];
+                }
+                else
+                {
+                    [self performSegueWithIdentifier: kSegueToReviewStatusViewController sender: self];
+                }
+            }
+            else
+            {
+                [self performSegueWithIdentifier: kSegueToReviewStatusViewController sender: self];
+            }
         });
     });
 }

diff --git a/Joystick/NMXDevice.h b/Joystick/NMXDevice.h
@@ -124,6 +124,7 @@ typedef enum : unsigned char {
 - (void) motorSet:(int)motorNumber ProgramStopPoint: (UInt32) position;
 - (void) motorSendToStartPoint: (int) motorNumber;
 - (unsigned char) motorAutoSetMicrosteps: (int) motorNumber;
+- (bool) motorQueryFeasibility: (int) motorNumber;
 - (void) motorSetStartHere: (int) motorNumber;
 - (void) motorSetStopHere: (int) motorNumber;
 - (void) motorSet:(int)motorNumber SetLeadInShotsOrTime: (UInt32) leadIn;

diff --git a/Joystick/NMXDevice.m b/Joystick/NMXDevice.m
@@ -20,7 +20,7 @@
 #define kDefaultsMotorPanInvert        @"MotorPanInvert"
 #define kDefaultsMotorTiltInvert       @"MotorTiltInvert"
 
-#define kCurrentSupportedFirmwareVersion 52
+#define kCurrentSupportedFirmwareVersion 54
 
 
 typedef enum : unsigned char {
@@ -87,7 +87,8 @@
     NMXCommandMotorQueryTravelShotsOrTravelTime = 113,
     NMXCommandMotorQueryLeadInShotsOrTime = 114,
     NMXCommandMotorQuerySleep = 117,
-    NMXCommandMotorQueryLeadOutShotsOrTime = 119
+    NMXCommandMotorQueryLeadOutShotsOrTime = 119,
+    NMXCommandMotorQueryProgramFeasibility = 120,
 
 } NMXCommandMotor;
 
@@ -910,6 +911,28 @@ - (unsigned char) motorAutoSetMicrosteps: (int) motorNumber {
     return microsteps;
 }
 
+- (bool) motorQueryFeasibility: (int) motorNumber {
+
+    if (_fwVersion < 54 )
+    {
+        return YES;
+    }
+
+    unsigned char   isFeasible;
+    unsigned char   newDataBytes[16];
+    [self setupBuffer: newDataBytes subAddress: motorNumber command: NMXCommandMotorQueryProgramFeasibility dataLength: 0];
+    NSData *newData = [NSData dataWithBytes: newDataBytes length: 10];
+
+    [self sendCommand: newData WithDesc: @"Query Feasibility" WaitForResponse: true WithTimeout: 3.0];
+
+    if ([self waitForResponse])
+    {
+        isFeasible = [[self extractReturnedNumber] UInt8Value];
+    }
+
+    return isFeasible;
+}
+
 - (void) mainSetStartHere {
 
     unsigned char newDataBytes[16];

diff --git a/Joystick/SetupViewController.m b/Joystick/SetupViewController.m
@@ -772,10 +772,35 @@ - (IBAction) handleJoystickButton: (UIButton *) sender {
 }
 
 - (void) checkProgramAndHandleNext {
+
+    NMXDevice * device = [AppExecutive sharedInstance].device;
 
-    // If we transition too fast, the hardware gets unhappy...
-    usleep(100);
-    [self performSegueWithIdentifier: kSegueToMotorRampingViewController sender: self];
+    if (appExecutive.is3P == NO) {
+
+        if ((NO == [device motorQueryFeasibility: device.sledMotor]) ||
+            (NO == [device motorQueryFeasibility: device.panMotor]) ||
+            (NO == [device motorQueryFeasibility: device.tiltMotor]))
+        {
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle: @"Too Fast For Motors"
+                                                            message: @"Increase shot duration"
+                                                           delegate: self
+                                                  cancelButtonTitle: @"OK"
+                                                  otherButtonTitles: nil];
+            [alert show];
+        }
+        else
+        {
+            // If we transition too fast, the hardware gets unhappy...
+            usleep(100);
+            [self performSegueWithIdentifier: kSegueToMotorRampingViewController sender: self];
+        }
+    }
+    else
+    {
+        // If we transition too fast, the hardware gets unhappy...
+        usleep(100);
+        [self performSegueWithIdentifier: kSegueToMotorRampingViewController sender: self];
+    }
 }
 
 - (IBAction) handleNextButton: (UIButton *) sender {