Force notifications which touch GUI elements onto main thread

Source/Objects/Custom Hardware/SNO+/ELLIE/ELLIEController.h

@@ -203,7 +203,8 @@
 - (IBAction)telliePing:(id)sender;
 - (IBAction)smelliePing:(id)sender;
 - (IBAction)interlockPing:(id)sender;
-- (IBAction)tubiiPing:(id)sender;
+- (void)tubiiPing;
+- (IBAction)tubiiPingAction:(id)sender;
 - (IBAction)tubiiRestart:(id)sender;
 - (IBAction)serverSettingsChanged:(id)sender;
 -(void)killInterlock:(NSNotification *)aNote;

Source/Objects/Custom Hardware/SNO+/ELLIE/ELLIEController.m

@@ -1585,22 +1585,18 @@ - (IBAction)tubiiRestart:(id)sender {
     }
     TUBiiModel* theTubiiModel = [tubiiModels objectAtIndex:0];
     if([[theTubiiModel keepAliveThread] isExecuting]){
-        NSString* response = @"TUBii keep alive thread is already active, restarting.\n";
+        NSString* response = @"TUBii keep alive thread is already active.\n";
         [tubiiThreadResponseTf setStringValue:response];
-        // This method will cancel the thread, causing a break statement to
-        // be called, ending a while loop. Once outside the loop the memory
-        // is tidied up and the user is promped (via a pop-up box) to
-        // re-activate the thread.
-        [theTubiiModel killKeepAlive:nil];
     } else {
         NSString* response = @"TUBii keep alive thread is getting a cold start.\n";
         [tubiiThreadResponseTf setStringValue:response];
         [theTubiiModel activateKeepAlive];
+        // Send a ping after a short delay
+        [self performSelector:@selector(tubiiPing) withObject:self afterDelay:1];
     }
-    [self tubiiPing:self];
 }
 
-- (IBAction)tubiiPing:(id)sender {
+-(void)tubiiPing{
     //////////////
     //Get a Tubii object
     NSArray*  tubiiModels = [[(ORAppDelegate*)[NSApp delegate] document] collectObjectsOfClass:NSClassFromString(@"TUBiiModel")];
@@ -1609,7 +1605,7 @@ - (IBAction)tubiiPing:(id)sender {
         return;
     }
     TUBiiModel* theTubiiModel = [tubiiModels objectAtIndex:0];
-
+    
     // If ping was requested by note, wait to see if keep alive inits OK.
     if([[theTubiiModel keepAliveThread] isExecuting]){
         NSString* response = @"TUBii keep alive thread is active.\n";
@@ -1620,6 +1616,10 @@ - (IBAction)tubiiPing:(id)sender {
     }
 }
 
+- (IBAction)tubiiPingAction:(id)sender {
+    [self tubiiPing];
+}
+
 -(void)tubiiDied:(NSNotification*)note{
     NSString* response = @"TUBii keep alive thread is not executing. Please try a restart";
     [tubiiThreadResponseTf setStringValue:response];

Source/Objects/Custom Hardware/SNO+/ELLIE/ELLIEModel.m

@@ -980,11 +980,15 @@ -(void) startTellieRun:(NSDictionary*)fireCommands forTELLIE:(BOOL)forTELLIE
         }
     }
 
+    ////////////////////////
+    // Check keep alive is running.
+    if(![[theTubiiModel keepAliveThread] isExecuting]){
+        NSLog(@"The keep alive thread between ORCA and TUBii was inactive. Relaunching.\n");
+        [theTubiiModel activateKeepAlive];
+    }
+
     ///////////////////////
     // Check trigger is being sent to asyncronus port of the MTC/D (EXT_A)
-    if([[theTubiiModel keepAliveThread] isCancelled]){
-        [theTubiiModel restartKeepAlive:nil];
-    }
     NSUInteger asyncTrigMask;
     @try{
         asyncTrigMask = [theTubiiModel asyncTrigMask];
@@ -1990,6 +1994,13 @@ -(void)startSmellieRun:(NSDictionary*)smellieSettings
         goto err;
     }
 
+    ////////////////////////
+    // Check keep alive is running.
+    if(![[theTubiiModel keepAliveThread] isExecuting]){
+        NSLog(@"The keep alive thread between ORCA and TUBii was inactive. Relaunching.\n");
+        [theTubiiModel activateKeepAlive];
+    }
+
     ///////////////////////
     // Check trigger is being sent to asyncronus port (EXT_A)
     NSUInteger asyncTrigMask;

Source/Objects/Custom Hardware/SNO+/ELLIE/ellie.xib

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="13F1603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
         <development version="5100" identifier="xcode"/>
@@ -2142,7 +2142,7 @@
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
                                                         <connections>
-                                                            <action selector="tubiiPing:" target="-2" id="UBr-wE-SJ0"/>
+                                                            <action selector="tubiiPingAction:" target="-2" id="DVB-bt-JFD"/>
                                                         </connections>
                                                     </button>
                                                 </subviews>

Source/Objects/Custom Hardware/SNO+/RedisClient/RedisClient.m

@@ -15,6 +15,9 @@ @implementation RedisClient
 
 - (void) setTimeout: (long) _timeout
 {
+    /*
+     Timeout should be specified in ms using a long unsigned integer
+    */
     @synchronized(self) {
         timeout = _timeout;
         if (context) {

Source/Objects/Custom Hardware/SNO+/TUBii/TUBiiModel.h

@@ -224,7 +224,6 @@ struct TUBiiState { //A struct that allows users of TUBiiModel to get/set all of
                                CounterInhibitOn: (bool) Inhibit;
 -(void)activateKeepAlive;
 -(void)pulseKeepAlive:(id)passed;
--(void)restartKeepAlive:(NSNotification*)aNote;
 -(void)killKeepAlive:(NSNotification*)aNote;
 @end
 

Source/Objects/Custom Hardware/SNO+/TUBii/TUBiiModel.m

@@ -89,6 +89,9 @@ - (id) init {
         connection = [[RedisClient alloc] init]; // Connection must be allocated before port and host name are set
         portNumber = TUBII_DEFAULT_PORT;
         strHostName = [[NSString alloc]initWithUTF8String:TUBII_DEFAULT_IP];
+        // Timeout is extended from 1s to 2s in an attempt to prevent the
+        // latency from remote shift stations causing timeouts
+        [connection setTimeout:2000];
     }
     return self;
 }
@@ -141,6 +144,9 @@ - (id) initWithCoder:(NSCoder *)aCoder {
 
         //Connection must be made before port and host name are set.
         connection = [[RedisClient alloc] initWithHostName:strHostName withPort:portNumber];
+        // Timeout is extended from 1s to 2s in an attempt to prevent the
+        // latency from remote shift stations causing timeouts
+        [connection setTimeout:2000];
     }
     return self;
 }
@@ -166,11 +172,6 @@ - (void) registerNotificationObservers{
                          name : ORRunAboutToStartNotification
                        object : nil];
 
-    [notifyCenter addObserver : self
-                     selector : @selector(restartKeepAlive:)
-                         name : @"TUBiiKeepAliveDied"
-                       object : nil];
-
     [notifyCenter addObserver : self
                      selector : @selector(killKeepAlive:)
                          name : @"TELLIEEmergencyStop"
@@ -962,27 +963,13 @@ -(void)pulseKeepAlive:(id)passed
         counter = counter + 1;
     }
 
-    NSLog(@"[TUBii]: Stopped sending keep-alive to TUBii - ELLIE pulses will be shut off\n");
-
-    // This thread should always be running. If it's died, post a note to get it automatically restarted.
-    [[NSNotificationCenter defaultCenter] postNotificationName:@"TUBiiKeepAliveDied" object:nil];
+    NSLogColor([NSColor redColor],@"[TUBii]: Stopped sending keep-alive to TUBii\n");
+    NSLogColor([NSColor redColor],@"[TUBii]: Unless you restart this process the ELLIE systems will not be able to trigger through TUBii. If you'd like to restart at a later time please do so from the servers tab of the ELLIE gui\n");
 
     // release memory
     [pool release];
 }
 
--(void)restartKeepAlive:(NSNotification*)aNote{
-    /*
-     If the keep alive has died, as a user to re-start it.
-     */
-    BOOL restart = ORRunAlertPanel(@"The keep alive pulse to TUBii has died.",
-                                   @"Unless you restart this process the ELLIE systems will not be able to trigger through TUBii. If you'd like to restart at a later time please do so from the servers tab of the ELLIE gui",
-                                    @"Restart",
-                                    @"Cancel",nil);
-    if(restart){
-        [self activateKeepAlive];
-    }
-}
 
 -(void)killKeepAlive:(NSNotification*)aNote
 {