Write min of 164 or swapSize to csv, expand size of swap in test-app to 164

Author: deslaughter

discon-client/client.go

@@ -40,7 +40,7 @@ func init() {
 		}
 		recvSwapFile, err = os.Create(csvFileName + "_recv.csv")
 		if err != nil {
-			log.Fatal("discon-client: error creating sent swap file:", err)
+			log.Fatal("discon-client: error creating recv swap file:", err)
 		}
 	}
 
@@ -132,10 +132,11 @@ func DISCON(avrSwap *C.float, aviFail *C.int, accInFile, avcOutName, avcMsg *C.c
 
 	if debug {
 		log.Println("discon-client: sent payload:\n", payload)
-		for _, v := range payload.Swap[:163] {
+		outSwapSize := min(swapSize, 163)
+		for _, v := range payload.Swap[:outSwapSize-1] {
 			fmt.Fprintf(sentSwapFile, "%g,", v)
 		}
-		fmt.Fprintf(sentSwapFile, "%g\n", payload.Swap[163])
+		fmt.Fprintf(sentSwapFile, "%g\n", payload.Swap[outSwapSize-1])
 	}
 
 	// Read response from server
@@ -152,10 +153,11 @@ func DISCON(avrSwap *C.float, aviFail *C.int, accInFile, avcOutName, avcMsg *C.c
 
 	if debug {
 		log.Println("discon-client: received payload:\n", payload)
-		for _, v := range payload.Swap[:163] {
+		outSwapSize := min(swapSize, 163)
+		for _, v := range payload.Swap[:outSwapSize-1] {
 			fmt.Fprintf(recvSwapFile, "%g,", v)
 		}
-		fmt.Fprintf(recvSwapFile, "%g\n", payload.Swap[163])
+		fmt.Fprintf(recvSwapFile, "%g\n", payload.Swap[outSwapSize-1])
 	}
 
 	// Set fail flag

test-app/test-app.c

@@ -11,7 +11,7 @@ typedef void (*DISCON_FUNC)(float *avrSWAP, int *aviFAIL, char *accINFILE, char
 #endif
 
 // Length of the swap array
-#define SWAP_ARRAY_SIZE 130
+#define SWAP_ARRAY_SIZE 164
 
 // Length of the character arrays
 #define CHAR_ARRAY_SIZE 32