[Firebug-cvs] firebug/project/java/src/org/firebug DBLogger.java,1.14,1.15 SensorMsg.java,1.2,1.3 SensorPacket.java,1.6,1.7

[<che...@us...>]

Update of /cvsroot/firebug/firebug/project/java/src/org/firebug
In directory sc8-pr-cvs1:/tmp/cvs-serv14580/project/java/src/org/firebug

Modified Files:
	DBLogger.java SensorMsg.java SensorPacket.java 
Log Message:
sensor msg now parsed collectly into the DB

Index: DBLogger.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/DBLogger.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DBLogger.java	22 May 2003 03:06:25 -0000	1.14
--- DBLogger.java	23 May 2003 00:57:14 -0000	1.15
***************
*** 6,9 ****
--- 6,10 ----
  import java.sql.*;
  import java.util.Random;
+ import net.tinyos.message.*;
  
  
***************
*** 32,68 ****
  	
  	int baseID=packet[10];
- 	//int id=TestDBLogger.getRandomID(baseID);
  	return baseID; //id;
      }
  
-     private float getTemp (byte [] packet) {
- 
-         //float temp = (float)(72.0 +  (3*rand.nextGaussian()));
- 	//return temp;
- 	float basetemp=(float)((long)packet[12]*256+(long)packet[11]);
- 	//float temp=TestDBLogger.getRandomTemp(basetemp);
- 	return basetemp; //temp;
-     }
- 
- 
-     private float getRelHum (byte [] packet) {
- 
- 	//float rel_hum = packet[0];
- 	//return rel_hum;
- 
- 	float baserelhum=packet[14]*256+packet[13];
- 	//float rel_hum=TestDBLogger.getRandomRelHum(baserelhum);
- 	return 0 ; //rel_hum;
-     }  
- 
-     private float getBaroPres (byte [] packet) {
- 	
- 	//float baro_pres = packet[1];
- 	//return baro_pres;
- 
- 	float basebaropres=packet[16]*256+packet[15];
- 	//float baro_pres=TestDBLogger.getRandomBaroPres(basebaropres);
- 	return 0; //baro_pres;
-     }
  
      private int get_packet_type(byte [] packet) {
--- 33,39 ----
***************
*** 89,92 ****
--- 60,65 ----
          // message.
  
+ 	SensorMsg msg = new SensorMsg(packet,10,24);
+ 
          Connection conn = dbh.getConnection();
  
***************
*** 98,105 ****
          int time = (int)System.currentTimeMillis();
  
!         float temp = getTemp(packet);
          int mote_id = getMoteID(packet);
! 	float rel_hum = getRelHum(packet);
!         float baro_pres = getBaroPres(packet);
  
  	if (get_packet_type(packet) != 1){
--- 71,85 ----
          int time = (int)System.currentTimeMillis();
  
! 
          int mote_id = getMoteID(packet);
!         int mote_id_test = msg.get_MoteID();
! 
! 	if (mote_id != mote_id_test){
! 	    System.out.println(mote_id+ " "+ mote_id_test + "\n");
! 	}
!   
!         float temp = msg.get_temp();
! 	float rel_hum = msg.get_rel_hum(); 
!         float baro_pres = msg.get_baro_pres();
  
  	if (get_packet_type(packet) != 1){

Index: SensorMsg.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/SensorMsg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SensorMsg.java	22 May 2003 23:00:03 -0000	1.2
--- SensorMsg.java	23 May 2003 00:57:14 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  package org.firebug;
  
+ 
  public class SensorMsg extends net.tinyos.message.Message {
  
***************
*** 82,93 ****
       * message type name and the non-indexed field values.
       */
      public String toString() {
        String s = "Message <SensorMsg> \n";
        s += "  [MoteID=0x"+Long.toHexString(get_MoteID())+"]\n";
!       s += "  [temp=0x"+Long.toHexString(get_temp())+"]\n";
!       s += "  [rel_hum=0x"+Long.toHexString(get_rel_hum())+"]\n";
!       s += "  [baro_pres=0x"+Long.toHexString(get_baro_pres())+"]\n";
        return s;
      }
  
      // Message-type-specific access methods appear below.
--- 83,96 ----
       * message type name and the non-indexed field values.
       */
+     /*
      public String toString() {
        String s = "Message <SensorMsg> \n";
        s += "  [MoteID=0x"+Long.toHexString(get_MoteID())+"]\n";
!       s += "  [temp=0x" + Float.intBitsToFloat(get_temp()) + "]\n";
!       s += "  [rel_hum=0x"+Float.toHexString(get_rel_hum())+"]\n";
!       s += "  [baro_pres=0x"+Float.toHexString(get_baro_pres())+"]\n";
        return s;
      }
+     */
  
      // Message-type-specific access methods appear below.

Index: SensorPacket.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/SensorPacket.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SensorPacket.java	22 May 2003 03:06:25 -0000	1.6
--- SensorPacket.java	23 May 2003 00:57:14 -0000	1.7
***************
*** 87,93 ****
  	  s += "  [MoteID="+Long.toString(packet[10])+ "]\n";
  	  //Humidity
! 	  s += "  [Humidity Data="+Long.toString(packet[12]*256)+Long.toString(packet[11])+"]";
  	  //Temperature
! 	  s += "  [TempData="+Long.toString(packet[14]*256)+ Long.toString(packet[13])+"]";
        }
        return s;
--- 87,94 ----
  	  s += "  [MoteID="+Long.toString(packet[10])+ "]\n";
  	  //Humidity
! 	  //s += "  [Humidity Data="+Long.toString(packet[12]*256)+Long.toString(packet[11])+"]";
  	  //Temperature
! 	  //s += "  [TempData="+Long.toString(packet[14]*256)+ Long.toString(packet[13])+"]";
! 	  s += "  [TempData="+Long.toString(packet[14])+ " " + Long.toString(packet[13])+"]";
        }
        return s;