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

[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-serv18003/net/sf/firebug/DataCollection

Modified Files:
	DataCollect.java 
Log Message:
Added Internal voltage sensor calibration

Index: DataCollect.java
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/fireworks/tools/java/net/sf/firebug/DataCollection/DataCollect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DataCollect.java	29 Aug 2005 18:52:25 -0000	1.3
--- DataCollect.java	29 Aug 2005 19:15:56 -0000	1.4
***************
*** 49,53 ****
      }
  
!     public static double pressure_mbar(int raw_pressure, int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
--- 49,53 ----
      }
  
!     private static double pressure_mbar(int raw_pressure, int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
***************
*** 79,83 ****
      }
      
!     public static double pressure_inHg(int raw_pressure, int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
--- 79,83 ----
      }
      
!     private static double pressure_inHg(int raw_pressure, int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
***************
*** 107,111 ****
      }
      
!     public static double pressure_temp(int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
--- 107,111 ----
      }
      
!     private static double pressure_temp(int raw_temperature, int[] calibration) {
          int c1,c2,c3,c4,c5,c6;
          if (calibration.length != 4)
***************
*** 129,132 ****
--- 129,136 ----
      }
      
+     private static double voltage(int raw_ivolt) {
+ 	return (((double)raw_ivolt)/4096.0*1.5*2);
+     }
+ 
      public DataCollect() {
  	dlist = new LinkedList();
***************
*** 249,256 ****
  	
  	System.out.println("Raw calibration readings "+DataCollect.byteArrayToHexString(DataCollect.intToByteArray(cMsg.get_calibration())));
  	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()));
! 	
! 	/* Delete the printed data */
  	dlist.remove(dindex);
  	clist.remove(cindex);
--- 253,261 ----
  	
  	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()));
!  	/* Delete the printed data */
  	dlist.remove(dindex);
  	clist.remove(cindex);