--- a/ladcp2	Thu Nov 21 14:01:21 2013 +0000
+++ b/ladcp2	Fri Jul 03 10:25:08 2020 -0400
@@ -2,9 +2,9 @@
 #======================================================================
 #                    L A D C P 2 
 #                    doc: Wed Mar 10 22:23:52 2004
-#                    dlm: Fri Dec 10 14:28:20 2010
+#                    dlm: Fri Jul  3 10:16:46 2020
 #                    (c) 2004 A.M. Thurnherr
-#                    uE-Info: 70 34 NIL 0 0 72 2 2 8 NIL ofnI
+#                    uE-Info: 137 66 NIL 0 0 72 2 2 8 NIL ofnI
 #======================================================================
 
 # HISTORY:
@@ -22,6 +22,7 @@
 #  Aug 25, 2010: - DEFAULTS.expect -> CRUISE_SETUP.expect
 #		 - libBB.expect -> libRDI.expect
 #  Dec 10, 2010: - allow restarting a cast with same number
+#  Jul  3, 2020: - expunged master/slave terminology
 
 #----------------------------------------------------------------------
 # Setup
@@ -90,8 +91,8 @@
 if {![memory_empty]} {
 	if {![affirm "\nWARNING: Memory is not empty; continue anyway? (y/N) " 10]} {
 		send_user "Putting instruments to sleep...";
-		select_master 0; put_to_sleep;
-		select_slave; put_to_sleep;
+		select_DL 0; put_to_sleep;
+		select_UL; put_to_sleep;
 		send_user "\nDone\n";
 		exit;
 	}
@@ -100,40 +101,40 @@
 }
 
 exec mkdir $cast_dir;
-exec cp $master_cmd_file $cast_dir;
-exec cp $slave_cmd_file $cast_dir;
+exec cp $DL_cmd_file $cast_dir;
+exec cp $UL_cmd_file $cast_dir;
 exec echo $stn > .last_stn;
 cd $cast_dir;
 
-if {![file isfile $master_cmd_file]} {
-	error "Failed to copy $master_cmd_file to [pwd]";
+if {![file isfile $DL_cmd_file]} {
+	error "Failed to copy $DL_cmd_file to [pwd]";
 }
-if {![file isfile $slave_cmd_file]} {
-	error "Failed to copy $slave_cmd_file to [pwd]";
+if {![file isfile $UL_cmd_file]} {
+	error "Failed to copy $UL_cmd_file to [pwd]";
 }
 
 regsub {.*/} $argv0 {} basename;
 start_logging [format %s_%s.log $basename $stnstr];
 
 send_user "Resetting instruments to factory defaults...";
-select_master 0; load_factory_defaults;
-select_slave; load_factory_defaults;
+select_DL 0; load_factory_defaults;
+select_UL; load_factory_defaults;
 
 send_user "\nSetting instrument clocks...";
 set_computer_time;
-select_master 0; set_instrument_clock;
-select_slave; set_instrument_clock;
+select_DL 0; set_instrument_clock;
+select_UL; set_instrument_clock;
 
 send_user "\nSetting deployment names...";
-select_master; set_deployment_name [format $master_deployment_name_fmt $stn];
-select_slave; set_deployment_name [format $slave_deployment_name_fmt $stn];
+select_DL; set_deployment_name [format $DL_deployment_name_fmt $stn];
+select_UL; set_deployment_name [format $UL_deployment_name_fmt $stn];
 
 send_user "\nUploading command files";
-select_slave 0;
-upload_file $slave_cmd_file [format %s_log $slave_cmd_file] "[format $slave_deployment_name_fmt $stn].hwconfig";
+select_UL 0;
+upload_file $UL_cmd_file [format %s_log $UL_cmd_file] "[format $UL_deployment_name_fmt $stn].hwconfig";
 resume_logging [format %s_%s.log $basename $stnstr];
-select_master;
-upload_file $master_cmd_file [format %s_log $master_cmd_file] "[format $master_deployment_name_fmt $stn].hwconfig";
+select_DL;
+upload_file $DL_cmd_file [format %s_log $DL_cmd_file] "[format $DL_deployment_name_fmt $stn].hwconfig";
 
 send_user "\nDone\n";