Update of /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10148
Modified Files:
DataCollect.java
Log Message:
Commented unnecessary display
Index: DataCollect.java
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection/DataCollect.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DataCollect.java 29 Aug 2005 22:45:00 -0000 1.5
--- DataCollect.java 29 Aug 2005 23:27:01 -0000 1.6
***************
*** 256,271 ****
System.out.println("Source : "+ dMsg.get_src());
System.out.println("Sequence Number: "+ dMsg.get_seq_no());
! System.out.println("Raw temperature: "+ dMsg.get_temperature());
! System.out.println("Raw humidity : "+ dMsg.get_humidity());
! System.out.println("Raw voltage : "+ dMsg.get_ivolt());
! System.out.println("Raw itemp : "+ dMsg.get_itemp());
! System.out.println("Raw Pressure : "+ dMsg.get_pressure());
!
! System.out.println("Raw calibration readings "+DataCollect.byteArrayToHexString(DataCollect.intToByteArray(cMsg.get_calibration())));
! System.out.println("");
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 */
--- 256,270 ----
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());
! prt("Raw voltage : "+ dMsg.get_ivolt());
! prt("Raw itemp : "+ dMsg.get_itemp());
! prt("Raw Pressure : "+ dMsg.get_pressure());
! 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 */
|
