Merge pull request #7 from DynamicPerception/mitch

Mitch
DynamicPerception · May 17, 2016 · 7bbb79d · 7bbb79d
2 parents 59d8c87 + 361cde0
commit 7bbb79d
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 51 deletions.
diff --git a/Joystick/DeviceTableViewCell.m b/Joystick/DeviceTableViewCell.m
@@ -141,7 +141,7 @@ - (void) didConnect: (NMXDevice *) device
                 NSString *deviceImage = [self getImageForDeviceStatus: device];
                 self.imageView.image = [UIImage imageNamed: deviceImage];
 
-                if ((NMXRunStatusStopped != queryStatus) || NMXRunStatusStopped != queryStatusKeyFrame)
+                if ((NMXRunStatusRunning & queryStatus) || NMXRunStatusRunning & queryStatusKeyFrame)
                 {
                     [self.tableView navigateToMainViewWithDevice: self.device];
                 }

diff --git a/Joystick/Info.plist b/Joystick/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5</string>
+	<string>6</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIMainStoryboardFile</key>

diff --git a/Joystick/MainViewController.m b/Joystick/MainViewController.m
@@ -882,7 +882,7 @@ - (void) viewDidAppear: (BOOL) animated {
     int queryStatusKeyFrame = [device queryKeyFrameProgramRunState];
     int queryStatus = [device mainQueryRunStatus];
 
-    if (NMXRunStatusStopped != queryStatus || NMXRunStatusStopped != queryStatusKeyFrame)
+    if (NMXRunStatusRunning & queryStatus || NMXRunStatusRunning & queryStatusKeyFrame)
     {
         if (NMXRunStatusKeyframe & queryStatusKeyFrame)
         {
@@ -910,7 +910,7 @@ - (void) viewDidAppear: (BOOL) animated {
         [self enterJoystickMode];
     }
 
-    if (NMXRunStatusStopped == queryStatus)
+    if ((NMXRunStatusRunning & queryStatus) == 0)
     {
         [NSTimer scheduledTimerWithTimeInterval:0.10 target:self selector:@selector(startStopQueryTimer) userInfo:nil repeats:NO];
     }

diff --git a/Joystick/MotorRampingViewController.m b/Joystick/MotorRampingViewController.m
@@ -497,8 +497,8 @@ - (void) viewWillAppear: (BOOL) animated {
 
     //NSLog(@"viewWillAppear ramping");
 
-    if (NMXRunStatusStopped != [[AppExecutive sharedInstance].device mainQueryRunStatus] ||
-        NMXRunStatusStopped != [[AppExecutive sharedInstance].device queryKeyFrameProgramRunState])
+    if (NMXRunStatusRunning & [[AppExecutive sharedInstance].device mainQueryRunStatus] ||
+        NMXRunStatusRunning & [[AppExecutive sharedInstance].device queryKeyFrameProgramRunState])
     {
         NSLog(@"gotoreview");
         [self showVoltage];

diff --git a/Joystick/NMXDevice.h b/Joystick/NMXDevice.h
@@ -42,14 +42,14 @@ typedef enum : unsigned char {
 
 typedef enum : unsigned char {
 
-    NMXRunStatusUnknown   = -1,
-    NMXRunStatusStopped   = 0,
+    NMXRunStatusUnknown   = 0xFF,
     NMXRunStatusRunning   = 1 << 0,
     NMXRunStatusPaused    = 1 << 1,
     NMXRunStatusKeyframe  = 1 << 2,
     NMXRunStatusDelayTimer= 1 << 3,
     NMXRunStatusKeepAlive = 1 << 4,
     NMXRunStatusPingPong  = 1 << 5,
+
 } NMXRunStatus;
 
 

diff --git a/Joystick/NMXDevice.m b/Joystick/NMXDevice.m
@@ -1016,10 +1016,10 @@ - (NMXRunStatus) runStatusFromOldRunStatus:(_Deprecated_NMXRunStatus) runStatus
     switch (runStatus)
     {
         case _Deprecated_NMXRunStatusStopped :
-            newStatus = NMXRunStatusStopped;
+            newStatus = 0;
             break;
         case _Deprecated_NMXRunStatusPaused :
-            newStatus = NMXRunStatusPaused;
+            newStatus = NMXRunStatusPaused | NMXRunStatusRunning;
             break;
         case  _Deprecated_NMXRunStatusRunning:
             newStatus = NMXRunStatusRunning;
@@ -1045,10 +1045,10 @@ - (NMXRunStatus) runStatusFromOldKeyframRunStatus:(_Deprecated_NMXKeyFrameRunSta
     switch (runStatus)
     {
         case _Deprecated_NMXKeyFrameRunStatusStopped :
-            newStatus = NMXRunStatusStopped;
+            newStatus = 0;
             break;
         case _Deprecated_NMXKeyFrameRunStatusPaused :
-            newStatus = NMXRunStatusPaused;
+            newStatus = NMXRunStatusPaused | NMXRunStatusRunning;
             break;
         case  _Deprecated_NMXKeyFrameRunStatusRunning:
             newStatus = NMXRunStatusRunning;
@@ -2361,7 +2361,7 @@ - (UInt32) queryKeyFrameProgramRunState {
 
         runState = [self runStatusFromOldKeyframRunStatus:(_Deprecated_NMXKeyFrameRunStatus)runState];
 
-        if (runState != NMXRunStatusStopped)
+        if (runState & NMXRunStatusRunning)
         {
             runState |= NMXRunStatusKeyframe;  // We are running in keyframe mode so set the bit flag
         }

diff --git a/Joystick/ReviewStatusViewController.m b/Joystick/ReviewStatusViewController.m
@@ -1138,7 +1138,7 @@ - (void) setupAfterConnection {
     {
         [self transitionToState: ControllerStatePauseProgram];
     }
-    else if (runStatus == NMXRunStatusStopped)
+    else
     {
         [self transitionToState: ControllerStateMotorRampingOrSendMotors];
     }
@@ -1912,18 +1912,6 @@ - (void) handleKeyFrameStatusTimer: (NSTimer *) sender {
     {
         NSLog(@"handleKeyframeStatusTimer runStatus: NMXRunStatusPaused");
     }
-    else if (runStatus == NMXRunStatusStopped)
-    {
-        NSLog(@"handleKeyframeStatusTimer runStatus: NMXRunStatusStopped");
-
-        [keyframeTimer invalidate];
-        keyframeTimer = nil;
-
-        [self clearFields];
-        keepAliveView.hidden = YES;
-        [self transitionToState: ControllerStateMotorRampingOrSendMotors];
-
-    }
     else if (runStatus & NMXRunStatusKeepAlive)
     {
         NSLog(@"keep alive");
@@ -1952,11 +1940,23 @@ - (void) handleKeyFrameStatusTimer: (NSTimer *) sender {
                                     playhead.frame.size.width,
                                     playhead.frame.size.height);
     }
-    else
+    else if (runStatus & NMXRunStatusUnknown)
     {
         NSLog(@"something else");
         [self killStatusTimerOnDisconnect];
     }
+    else
+    {
+        NSLog(@"handleKeyframeStatusTimer runStatus: Stopped");
+
+        [keyframeTimer invalidate];
+        keyframeTimer = nil;
+
+        [self clearFields];
+        keepAliveView.hidden = YES;
+        [self transitionToState: ControllerStateMotorRampingOrSendMotors];
+
+    }
 }
 
 - (void) handleStatusTimer: (NSTimer *) sender {
@@ -1968,27 +1968,6 @@ - (void) handleStatusTimer: (NSTimer *) sender {
 
         // This state should only happen from the user hitting pause, and we already handle that transition...
     }
-    else if (runStatus == NMXRunStatusStopped) {
-        NSLog(@"handleStatusTimer runStatus: NMXRunStatusStopped");
-
-        // Due to a firmware bug.  We want to make sure we are really stopped...
-
-        runStatus = [device mainQueryRunStatus];
-
-        if (NMXRunStatusStopped == runStatus)
-        {
-            [self.statusTimer invalidate];
-            self.statusTimer = nil;
-
-            [self clearFields];
-            keepAliveView.hidden = YES;
-            [self transitionToState: ControllerStateMotorRampingOrSendMotors];
-        }
-        else
-        {
-            DDLogWarn(@"Saw a FAKE stopped response");
-        }
-    }
     else if (runStatus & NMXRunStatusDelayTimer) {
 
         self.totalRunTime = [device mainQueryTotalRunTime];
@@ -2185,7 +2164,7 @@ - (void) handleStatusTimer: (NSTimer *) sender {
         }
 
     }
-    else {
+    else if (runStatus == NMXRunStatusUnknown) {
         NSLog(@"something else: %i",runStatus);
 
         [self.statusTimer invalidate];
@@ -2202,6 +2181,29 @@ - (void) handleStatusTimer: (NSTimer *) sender {
         });
 
     }
+    else {
+        NSLog(@"handleStatusTimer runStatus: Stopped");
+
+        // Due to a firmware bug.  We want to make sure we are really stopped...
+
+        runStatus = [device mainQueryRunStatus];
+
+        if ((runStatus & NMXRunStatusPaused) == 0 &&
+            (runStatus & NMXRunStatusRunning) == 0)
+        {
+            [self.statusTimer invalidate];
+            self.statusTimer = nil;
+
+            [self clearFields];
+            keepAliveView.hidden = YES;
+            [self transitionToState: ControllerStateMotorRampingOrSendMotors];
+        }
+        else
+        {
+            DDLogWarn(@"Saw a FAKE stopped response");
+        }
+    }
+
 }
 
 - (void) calculatePingPongReverse

diff --git a/Joystick/SetupViewController.m b/Joystick/SetupViewController.m
@@ -357,8 +357,8 @@ - (void) viewWillAppear: (BOOL) animated {
                                                object: nil];
     //NSLog(@"viewwillappear setup");
 
-    if (NMXRunStatusStopped != [[AppExecutive sharedInstance].device mainQueryRunStatus] ||
-        NMXRunStatusStopped != [[AppExecutive sharedInstance].device queryKeyFrameProgramRunState])
+    if (NMXRunStatusRunning & [[AppExecutive sharedInstance].device mainQueryRunStatus] ||
+        NMXRunStatusRunning & [[AppExecutive sharedInstance].device queryKeyFrameProgramRunState])
     {
         //NSLog(@"randall load status not stopped setupVC: %i",[[AppExecutive sharedInstance].device queryKeyFrameProgramRunState]);