Bug 811 NDS1 12.2 correct byte-ordering in status channels 2

git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@3967 6dcd42c9-f523-4c6d-aada-af552506706e

NEWS

@@ -13,6 +13,7 @@ Changes for 2.10
 ==================================================================================================
 Changes for 2.9.1
 ==================================================================================================
+- Bug Fix (811): NDS1 Version 12.2: Fix byte-ordering in 'status channels 2' 
 - Added individual channel reset to BURT value capability for SDF_TABLE display.
 - Bug Fix (810): Code not properly resetting SW1S and SW2S for FMC parts when in local mode.
   Operation of the FMC parts was not affected by this bug, but caused issues with SDF

src/daqd/comm.y

@@ -1384,6 +1384,7 @@ CommandLine: /* Nothing */
 		    if (schan) {
 		      *yyout << setw (channel_t::channel_name_max_len) << setfill (' ') 
 			   << ((my_lexer *) lexer) -> channels [i].name;
+                      yyout -> setf (ios::right, ios::adjustfield);
 		      if ($3) {
 		        *yyout << setw (8) << setfill ('0') << hex << ((my_lexer *) lexer) -> channels [i].sample_rate;
 		      } else {
@@ -1534,7 +1535,7 @@ CommandLine: /* Nothing */
 		    *yyout << daqd.trender.num_channels << " trend channels" << endl;
 		    *yyout << 1000000/daqd.writer_sleep_usec << "Hz clock" << endl;
 		  }
-		  *yyout << "chnum\tslow\t|name\t\t\t\t|rate\t|trend\t|group\t|bps\t|bytes\t|offset\t|type\t|active" << endl;
+		  *yyout << "chnum\tslow\t|name\t\t\t\t\t\t\t\t|rate\t|trend\t|group\t|bps\t|bytes\t|offset\t|type\t|active" << endl;
 
 		  for (int i = 0; i < num_channels; i++) {
 		    *yyout

src/daqd/daqc.h

@@ -14,7 +14,7 @@
 #include <limits.h>
 
 #define DAQD_PROTOCOL_VERSION 12
-#define DAQD_PROTOCOL_REVISION 1
+#define DAQD_PROTOCOL_REVISION 2
 
 #define DAQD_PORT 8088