Changeset 113 in tmcsimulator for branches/FEPSimulator/DataPacker.cpp

Timestamp:

10/14/2017 09:18:40 AM (9 years ago)

Author:

jtorres

Message:

LinuxVM non-segfaulting FEPSimulator - checkpoint

File:

• branches/FEPSimulator/DataPacker.cpp (modified) (4 diffs)

branches/FEPSimulator/DataPacker.cpp

@@ -1 +1 @@
 #include "DataPacker.h";
+#include <stdio.h>
 
 unsigned char * DataPacker::msg;
@@ -7 +8 @@
     DataPacker packer;
     msg = packer.staticDataPack(station);
-    pos = packer.dynamicDataPack(station, 5, pos);    
+/*    pos = packer.dynamicDataPack(station, 5, pos);    
     pos = packer.dynamicDataPack(station, 6, pos);
     pos = packer.dynamicDataPack(station, 7, pos);
@@ -19 +20 @@
     // will need to check if queue override is enabled (Currently, no queue
     // ldsMap[i].dataPack[16-1] = ;
-
+*/
     // byte 23: MAINLINE total volume
     msg[23 - 1] = station->MlTotVol;
@@ -30 +31 @@
             packer.chksum(msg, station->length - 1 - 1);
     
-    /*
     for (int j = 0; j < station->length; j++) {
         printf("%02X", msg[j]);
     }
     printf("\n");
-    */
+
+    return msg; 
 }