Index: branches/FEPSimulator/DataPacker.cpp
===================================================================
--- branches/fep_rpc_client/DataPacker.cpp	(revision 79)
+++ branches/FEPSimulator/DataPacker.cpp	(revision 80)
@@ -3,5 +3,5 @@
 unsigned char * DataPacker::msg;
 
-unsigned char * DataPacker::packData(LDS_LOOP *station) {
+unsigned char * DataPacker::packData(STATION *station) {
     int pos = 26;
     DataPacker packer;
@@ -38,5 +38,5 @@
 }
 
-int DataPacker::dynamicDataPack(LDS_LOOP *station, int packNo, int pos) {
+int DataPacker::dynamicDataPack(STATION *station, int packNo, int pos) {
     int i, j, vol, occ, haveData;
     //used for data byte 23 and 24
@@ -85,5 +85,5 @@
 }
 
-unsigned char * DataPacker::staticDataPack(LDS_LOOP *station) {
+unsigned char * DataPacker::staticDataPack(STATION *station) {
     int j;
     // Allocate memory for dataPack