Index: /branches/BasicFEPClient/network_factory.cpp
===================================================================
--- /branches/BasicFEPClient/network_factory.cpp	(revision 146)
+++ /branches/BasicFEPClient/network_factory.cpp	(revision 151)
@@ -37,15 +37,15 @@
 
 // Initializes the LOOP dataPack with all necessary static data and default dynamic data
-void NetworkFactory::init_loop_dataPack(STATION *loop)
+void NetworkFactory::init_loop_dataPack(STATION *station)
 {
 	int j;
 	// Allocate memory for dataPack
-	loop->dataPack = (unsigned char *) calloc(sizeof(unsigned char), loop->length);
+	station->dataPack = (unsigned char *) calloc(sizeof(unsigned char), station->length);
 
 	// dataPack 5-8: lane config
 	char d5 = 0, d6 = 0, d7 = 0, d8 = 0;		
-	for (j = 0; j < loop->loops.size(); j++)
-	{
-            char * currLoc = loop->loops[j]->loop_loc;
+	for (j = 0; j < station->loops.size(); j++)
+	{
+            char * currLoc = station->loops[j]->loop_loc;
 		for (int k = 0; k < 8; k++)
 		{
@@ -60,14 +60,14 @@
 		}
 	}
-	loop->dataPack[5-1] = d5;
-	loop->dataPack[6-1] = d6;
-	loop->dataPack[7-1] = d7;
-	loop->dataPack[8-1] = d8;
+	station->dataPack[5-1] = d5;
+	station->dataPack[6-1] = d6;
+	station->dataPack[7-1] = d7;
+	station->dataPack[8-1] = d8;
 
 	// dataPack 1: Drop number, i.e. station address
-	loop->dataPack[1-1] = loop->drop;
+	station->dataPack[1-1] = station->drop;
 
 	// dataPack2 (2 bytes per loop)
-	loop->dataPack[2-1] = loop->loops.size() * 2 + Fixed_Byte_To_Checksum;
+	station->dataPack[2-1] = station->loops.size() * 2 + Fixed_Byte_To_Checksum;
 
 	// dataPacket 3 (lowbyte: # of mainline loops, highbyte: # of opposite loops)
@@ -75,28 +75,28 @@
 	for (j = 1; j <= 6; j++)
 	{
-		low += DataAvail(loop->dataPack[5-1], j);
-		high += DataAvail(loop->dataPack[6-1], j);
+		low += DataAvail(station->dataPack[5-1], j);
+		high += DataAvail(station->dataPack[6-1], j);
 	}
 	high = high << 4;
-	loop->dataPack[3-1] = high | low;
+	station->dataPack[3-1] = high | low;
 
 	// dataPack4 (Miscl. flags: samples are: 80, A0, E0, 00)
-	loop->dataPack[4-1] = 0xA0;
+	station->dataPack[4-1] = 0xA0;
 
 	// dataPack 9: initialized as 00 (meaning no metering); need to be updated every 30 sec
-	loop->dataPack[9-1] = 0;
+	station->dataPack[9-1] = 0;
 
 	// datadataPack 10-13: lane malfunction? Assuming all functional
-	loop->dataPack[10-1] = 0;
-	loop->dataPack[11-1] = 0;
-	loop->dataPack[12-1] = 0;
-	loop->dataPack[13-1] = 0;
+	station->dataPack[10-1] = 0;
+	station->dataPack[11-1] = 0;
+	station->dataPack[12-1] = 0;
+	station->dataPack[13-1] = 0;
 
 	// dataPack 14-22: ramp metering data
 	// BYTE 16 and 22 need to be updated every 30 sec
 	bool found = false;
-	for (j = 0; j < loop->loops.size(); j++)
-	{
-		if (strcmp(loop->loops.at(0)->loop_loc, "DEMAND") == 0)
+	for (j = 0; j < station->loops.size(); j++)
+	{
+		if (strcmp(station->loops.at(0)->loop_loc, "DEMAND") == 0)
 		{
 			found = true;
@@ -107,50 +107,50 @@
 	{
 		// BYTE 14: mostly 07, some are 05, 03, 00
-		loop->dataPack[14-1] = 0x07;
+		station->dataPack[14-1] = 0x07;
 		// mostly 06(TOD table 1); some are 0B (No metering) or 05(traffic responsive)
-		loop->dataPack[15-1] = 0x06;
+		station->dataPack[15-1] = 0x06;
 		// most 00, some are 01 (queue override) or 80(Meter ON sign)
-		loop->dataPack[16-1] = 0x00;
+		station->dataPack[16-1] = 0x00;
 		// Field Manual Rate
-		loop->dataPack[17-1] = 0xFF;
+		station->dataPack[17-1] = 0xFF;
 		// TOC Manual Rate
-		loop->dataPack[18-1] = 0xFF;
+		station->dataPack[18-1] = 0xFF;
 		// PSO Manual Rate
-		loop->dataPack[19-1] = 0xFF;
+		station->dataPack[19-1] = 0xFF;
 		// CORM Rate
-		loop->dataPack[20-1] = 0xFF;
+		station->dataPack[20-1] = 0xFF;
 		// Local Responsive Rate. DON'T UNDERSTAND YET
-		loop->dataPack[21-1] = 0x00;
+		station->dataPack[21-1] = 0x00;
 		// TOD Rate: need to query RAMP plugin! 
-		loop->dataPack[22-1] = 0x00;
+		station->dataPack[22-1] = 0x00;
 	}
 	// LDS: NO Metering
 	else
 	{
-		loop->dataPack[14-1] = 0x00;
-		loop->dataPack[15-1] = 0x0B;
-		loop->dataPack[16-1] = 0x00;			
-		loop->dataPack[17-1] = 0xFF;
-		loop->dataPack[18-1] = 0xFF;
-		loop->dataPack[19-1] = 0xFF;
-		loop->dataPack[20-1] = 0xFF;
-		loop->dataPack[21-1] = 0x00;
-		loop->dataPack[22-1] = 0x00;
+		station->dataPack[14-1] = 0x00;
+		station->dataPack[15-1] = 0x0B;
+		station->dataPack[16-1] = 0x00;			
+		station->dataPack[17-1] = 0xFF;
+		station->dataPack[18-1] = 0xFF;
+		station->dataPack[19-1] = 0xFF;
+		station->dataPack[20-1] = 0xFF;
+		station->dataPack[21-1] = 0x00;
+		station->dataPack[22-1] = 0x00;
 	}
 
 	// dataPack 23-24: sum of mainline/Oppsite traffic data; need to be updated every 30 sec
-	loop->MlTotVol = 0;
-	loop->OppTotVol = 0;
-	loop->dataPack[23-1] = loop->MlTotVol;	
-	loop->dataPack[24-1] = loop->OppTotVol;	
+	station->MlTotVol = 0;
+	station->OppTotVol = 0;
+	station->dataPack[23-1] = station->MlTotVol;	
+	station->dataPack[24-1] = station->OppTotVol;	
 	
 	// dataPack 25-26: BYTE 25 is fixed, i.e. 03; BYTE 26 is either 0xA2 or 0x84
-	loop->dataPack[25-1] = 0x03;
-	loop->dataPack[26-1] = 0x84;
+	station->dataPack[25-1] = 0x03;
+	station->dataPack[26-1] = 0x84;
 
 	printf("lds=%d (%d), p1=%2X, p2=%2X, p3=%2X, p5=%2X, p6=%X, p7=%X, p8=%2X\n", 
-		loop->lds, loop->length, loop->dataPack[1-1], loop->dataPack[2-1], 
-		loop->dataPack[3-1], loop->dataPack[5-1], 
-		loop->dataPack[6-1], loop->dataPack[7-1], loop->dataPack[8-1]);
+		station->lds, station->length, station->dataPack[1-1], station->dataPack[2-1], 
+		station->dataPack[3-1], station->dataPack[5-1], 
+		station->dataPack[6-1], station->dataPack[7-1], station->dataPack[8-1]);
 }