[Firebug-cvs] fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection DataCollect.java,1.6,1.7

[Karthik D. <da...@us...>]

Update of /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20066/net/sf/firebug/DataCollection

Modified Files:
	DataCollect.java 
Log Message:
Implemented file output

Index: DataCollect.java
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection/DataCollect.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataCollect.java	29 Aug 2005 23:27:01 -0000	1.6
--- DataCollect.java	30 Aug 2005 00:28:35 -0000	1.7
***************
*** 8,12 ****
  import net.tinyos.message.*;
  import java.util.*;
! 
  /**
   *
--- 8,13 ----
  import net.tinyos.message.*;
  import java.util.*;
! import java.io.BufferedWriter;
! import java.io.FileWriter;
  /**
   *
***************
*** 39,42 ****
--- 40,44 ----
  
      String strAddr;
+     protected static String fName;
      int nPort;
      MoteIF dataCollectStub;
***************
*** 167,173 ****
  	prt("AM Type for Data collection is " + DataCollectionMsg.AM_TYPE);
  	
  	//        Thread th = new Thread(reader);
  	//        th.start();
- 	
      }
  
--- 169,181 ----
  	prt("AM Type for Data collection is " + DataCollectionMsg.AM_TYPE);
  	
+ 	/* Parse the arguments */
+ 	if(args.length > 1) {
+ 	    fName = args[0];
+ 	}
+ 	else {
+ 	    fName = "data.dat";
+ 	}
  	//        Thread th = new Thread(reader);
  	//        th.start();
      }
  
***************
*** 254,259 ****
  	DataCollectionMsg dMsg = (DataCollectionMsg) dlist.get(dindex);
  	CalibrationMsg cMsg = (CalibrationMsg) clist.get(cindex);
! 	System.out.println("Source         : "+ dMsg.get_src());
! 	System.out.println("Sequence Number: "+ dMsg.get_seq_no());
  	prt("Raw temperature: "+ dMsg.get_temperature());
  	prt("Raw humidity   : "+ dMsg.get_humidity());
--- 262,285 ----
  	DataCollectionMsg dMsg = (DataCollectionMsg) dlist.get(dindex);
  	CalibrationMsg cMsg = (CalibrationMsg) clist.get(cindex);
! 
! 	int source;
! 	long seqno;
! 	double pressure, humidity, temperature, voltage;
! 
! 	/* Compute */
! 	/* NOTE: 
! 	   1. Computing the temperature from pressure sensor. Something is screwed up with the readings from the humidity sensor 
! 	   2. Using the same temperature to correct the humidity coz the humidity sensor's temp readings are no good
! 	*/
! 	pressure = pressure_mbar(dMsg.get_pressure(), dMsg.get_temperature(), cMsg.get_calibration());
! 	temperature = pressure_temp(dMsg.get_temperature(), cMsg.get_calibration());
! 	voltage = voltage(dMsg.get_ivolt());
! 	humidity = humidity(dMsg.get_humidity(), pressure_temp(dMsg.get_temperature(), cMsg.get_calibration()));
! 
! 	source = dMsg.get_src();
! 	seqno  = dMsg.get_seq_no();
! 
! 	System.out.println("Source         : "+ source);
! 	System.out.println("Sequence Number: "+ seqno);
  	prt("Raw temperature: "+ dMsg.get_temperature());
  	prt("Raw humidity   : "+ dMsg.get_humidity());
***************
*** 263,271 ****
  	prt("Raw calibration readings "+DataCollect.byteArrayToHexString(DataCollect.intToByteArray(cMsg.get_calibration())));
  	prt("");
! 	System.out.println("Temperature    : "+pressure_temp(dMsg.get_temperature(), cMsg.get_calibration()));
! 	System.out.println("Pressure       : "+pressure_mbar(dMsg.get_pressure(), dMsg.get_temperature(), cMsg.get_calibration()));
! 	System.out.println("Voltage        : "+voltage(dMsg.get_ivolt()));
  	//	System.out.println("Humidity Temp  : "+humidity_temp(dMsg.get_itemp()));
! 	System.out.println("Humidity       : "+humidity(dMsg.get_humidity(), pressure_temp(dMsg.get_temperature(), cMsg.get_calibration())));
   	/* Delete the printed data */
  	dlist.remove(dindex);
--- 289,309 ----
  	prt("Raw calibration readings "+DataCollect.byteArrayToHexString(DataCollect.intToByteArray(cMsg.get_calibration())));
  	prt("");
! 	System.out.println("Temperature    : " + temperature );
! 	System.out.println("Pressure       : " + pressure);
! 	System.out.println("Voltage        : " + voltage);
  	//	System.out.println("Humidity Temp  : "+humidity_temp(dMsg.get_itemp()));
! 	System.out.println("Humidity       : " + humidity);
! 	/* Writing to file */
! 	if(fName != null) {
! 	    try {
! 		BufferedWriter out = new BufferedWriter(new FileWriter(fName, true));
! 		out.write(source + " " + seqno + " " + temperature + " " + voltage + " " + humidity + " " + pressure);
! 		out.newLine();
! 		out.close();
! 	    }
! 	    catch(Exception e) {
! 		e.printStackTrace();
! 	    }
! 	}
   	/* Delete the printed data */
  	dlist.remove(dindex);