[Firebug-cvs] firebug/project/java/src/org/firebug DBLogger.java,1.22,1.23 ListenFB.java,1.12,1.13 S
Brought to you by:
doolin
Menu
▾
▴
[Firebug-cvs] firebug/project/java/src/org/firebug DBLogger.java,1.22,1.23 ListenFB.java,1.12,1.13 SensorMsg.java,1.5,1.6 SensorPacket.java,1.9,1.10
|
From: <che...@us...> - 2003-11-19 00:54:03
|
Update of /cvsroot/firebug/firebug/project/java/src/org/firebug
In directory sc8-pr-cvs1:/tmp/cvs-serv18428/src/org/firebug
Modified Files:
DBLogger.java ListenFB.java SensorMsg.java SensorPacket.java
Log Message:
datalogger format changed for gps
Index: DBLogger.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/DBLogger.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DBLogger.java 30 Jul 2003 22:17:41 -0000 1.22
--- DBLogger.java 19 Nov 2003 00:53:59 -0000 1.23
***************
*** 60,64 ****
// message.
! SensorMsg msg = new SensorMsg(packet,5,23);
Connection conn = dbh.getConnection();
--- 60,64 ----
// message.
! SensorMsg msg = new SensorMsg(packet,5,32);
Connection conn = dbh.getConnection();
***************
*** 80,87 ****
int cnt=msg.get_cnt();
float temp = msg.get_temp();
float rel_hum = msg.get_rel_hum();
float baro_pres = msg.get_baro_pres();
- int rss=msg.get_rss();
if (get_packet_type(packet) != 1){
--- 80,94 ----
int cnt=msg.get_cnt();
+ int hours=msg.get_hours();
+ int minutes=msg.get_minutes();
+ int dec_sec=msg.get_dec_sec();
+ int Lat_deg=msg.get_Lat_deg();
+ int Lat_dec_min=msg.get_Lat_dec_min();
+ int Long_deg=msg.get_Long_deg();
+ int Long_dec_min=msg.get_Long_dec_min();
+ int NSEWind = msg.get_NSEWind();
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){
***************
*** 119,126 ****
//+ "time=" + time + ", "
+ "cnt=" + cnt + ","
+ "rel_hum=" + rel_hum + ", "
+ "baro_pres=" + baro_pres + ", "
! + "temp=" + temp + ", "
! + "rss=" + rss + " WHERE mote_id=" + mote_id;
String insertquery = "INSERT INTO cumulative VALUES ("
--- 126,140 ----
//+ "time=" + time + ", "
+ "cnt=" + cnt + ","
+ + "hours=" + hours + ","
+ + "minutes=" + minutes + ","
+ + "dec_sec=" + dec_sec + ","
+ + "Lat_deg=" + Lat_deg + ","
+ + "Lat_dec_min=" + Lat_dec_min + ","
+ + "Long_deg=" + Long_deg + ","
+ + "Long_dec_min=" + Long_dec_min + ","
+ + "NSEWind=" + NSEWind + ","
+ "rel_hum=" + rel_hum + ", "
+ "baro_pres=" + baro_pres + ", "
! + "temp=" + temp + " WHERE mote_id=" + mote_id;
String insertquery = "INSERT INTO cumulative VALUES ("
***************
*** 131,135 ****
+ baro_pres + ", "
+ cnt + ", "
! + rss + ")";
--- 145,156 ----
+ baro_pres + ", "
+ cnt + ", "
! + hours + ", "
! + minutes + ", "
! + dec_sec + ", "
! + Lat_deg + ", "
! + Lat_dec_min + ", "
! + Long_deg + ", "
! + Long_dec_min + ", "
! + NSEWind + ")";
Index: ListenFB.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/ListenFB.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ListenFB.java 30 Jul 2003 21:43:21 -0000 1.12
--- ListenFB.java 19 Nov 2003 00:53:59 -0000 1.13
***************
*** 39,42 ****
--- 39,43 ----
private static final int MAX_MSG_SIZE = 36;
private static final int PORT_SPEED = 19200;
+ //private static final int PORT_SPEED = 57600;
private static final int LENGTH_OFFSET = 4;
private int packetLength;
***************
*** 75,78 ****
--- 76,80 ----
static final int MAX_MSG_SIZE = 36;
static final int PORT_SPEED = 19200;
+ //static final int PORT_SPEED = 57600;
static final int LENGTH_OFFSET = 4;
Index: SensorMsg.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/SensorMsg.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SensorMsg.java 30 Jul 2003 22:17:41 -0000 1.5
--- SensorMsg.java 19 Nov 2003 00:53:59 -0000 1.6
***************
*** 10,19 ****
/** The default size of this message type in bytes. */
! public static final int DEFAULT_MESSAGE_SIZE = 18;
/** The Active Message type associated with this message. */
public static final int AM_TYPE = 128;
! /** Create a new SensorMsg of size 18. */
public SensorMsg() {
super(DEFAULT_MESSAGE_SIZE);
--- 10,19 ----
/** The default size of this message type in bytes. */
! public static final int DEFAULT_MESSAGE_SIZE = 26;
/** The Active Message type associated with this message. */
public static final int AM_TYPE = 128;
! /** Create a new SensorMsg of size 26. */
public SensorMsg() {
super(DEFAULT_MESSAGE_SIZE);
***************
*** 94,97 ****
--- 94,121 ----
} catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
try {
+ s += " [hours=0x"+Long.toHexString(get_hours())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [minutes=0x"+Long.toHexString(get_minutes())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [dec_sec=0x"+Long.toHexString(get_dec_sec())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [Lat_deg=0x"+Long.toHexString(get_Lat_deg())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [Lat_dec_min=0x"+Long.toHexString(get_Lat_dec_min())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [Long_deg=0x"+Long.toHexString(get_Long_deg())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [Long_dec_min=0x"+Long.toHexString(get_Long_dec_min())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
+ s += " [NSEWind=0x"+Long.toHexString(get_NSEWind())+"]\n";
+ } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
+ try {
s += " [temp="+Float.toString(get_temp())+"]\n";
} catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
***************
*** 102,108 ****
s += " [baro_pres="+Float.toString(get_baro_pres())+"]\n";
} catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
- try {
- s += " [rss=0x"+Long.toHexString(get_rss())+"]\n";
- } catch (ArrayIndexOutOfBoundsException aioobe) { /* Skip field */ }
return s;
}
--- 126,129 ----
***************
*** 112,116 ****
/////////////////////////////////////////////////////////
// Accessor methods for field: addr
! // Field type: int, unsigned
// Offset (bits): 0
// Size (bits): 16
--- 133,137 ----
/////////////////////////////////////////////////////////
// Accessor methods for field: addr
! // Field type: int
// Offset (bits): 0
// Size (bits): 16
***************
*** 118,125 ****
/**
! * Return whether the field 'addr' is signed (false).
*/
public static boolean isSigned_addr() {
! return false;
}
--- 139,146 ----
/**
! * Return whether the field 'addr' is signed (true).
*/
public static boolean isSigned_addr() {
! return true;
}
***************
*** 175,179 ****
/////////////////////////////////////////////////////////
// Accessor methods for field: cnt
! // Field type: int, unsigned
// Offset (bits): 16
// Size (bits): 16
--- 196,200 ----
/////////////////////////////////////////////////////////
// Accessor methods for field: cnt
! // Field type: int
// Offset (bits): 16
// Size (bits): 16
***************
*** 181,188 ****
/**
! * Return whether the field 'cnt' is signed (false).
*/
public static boolean isSigned_cnt() {
! return false;
}
--- 202,209 ----
/**
! * Return whether the field 'cnt' is signed (true).
*/
public static boolean isSigned_cnt() {
! return true;
}
***************
*** 237,251 ****
/////////////////////////////////////////////////////////
! // Accessor methods for field: temp
! // Field type: float, unsigned
// Offset (bits): 32
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'temp' is signed (false).
*/
public static boolean isSigned_temp() {
! return false;
}
--- 258,776 ----
/////////////////////////////////////////////////////////
! // Accessor methods for field: hours
! // Field type: short
// Offset (bits): 32
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'hours' is signed (true).
+ */
+ public static boolean isSigned_hours() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'hours' is an array (false).
+ */
+ public static boolean isArray_hours() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'hours'
+ */
+ public static int offset_hours() {
+ return (32 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'hours'
+ */
+ public static int offsetBits_hours() {
+ return 32;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'hours'
+ */
+ public short get_hours() {
+ return (short)getUIntElement(offsetBits_hours(), 8);
+ }
+
+ /**
+ * Set the value of the field 'hours'
+ */
+ public void set_hours(short value) {
+ setUIntElement(offsetBits_hours(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'hours'
+ */
+ public static int size_hours() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'hours'
+ */
+ public static int sizeBits_hours() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: minutes
+ // Field type: short
+ // Offset (bits): 40
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'minutes' is signed (true).
+ */
+ public static boolean isSigned_minutes() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'minutes' is an array (false).
+ */
+ public static boolean isArray_minutes() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'minutes'
+ */
+ public static int offset_minutes() {
+ return (40 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'minutes'
+ */
+ public static int offsetBits_minutes() {
+ return 40;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'minutes'
+ */
+ public short get_minutes() {
+ return (short)getUIntElement(offsetBits_minutes(), 8);
+ }
+
+ /**
+ * Set the value of the field 'minutes'
+ */
+ public void set_minutes(short value) {
+ setUIntElement(offsetBits_minutes(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'minutes'
+ */
+ public static int size_minutes() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'minutes'
+ */
+ public static int sizeBits_minutes() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: dec_sec
+ // Field type: int
+ // Offset (bits): 48
+ // Size (bits): 16
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'dec_sec' is signed (true).
+ */
+ public static boolean isSigned_dec_sec() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'dec_sec' is an array (false).
+ */
+ public static boolean isArray_dec_sec() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'dec_sec'
+ */
+ public static int offset_dec_sec() {
+ return (48 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'dec_sec'
+ */
+ public static int offsetBits_dec_sec() {
+ return 48;
+ }
+
+ /**
+ * Return the value (as a int) of the field 'dec_sec'
+ */
+ public int get_dec_sec() {
+ return (int)getUIntElement(offsetBits_dec_sec(), 16);
+ }
+
+ /**
+ * Set the value of the field 'dec_sec'
+ */
+ public void set_dec_sec(int value) {
+ setUIntElement(offsetBits_dec_sec(), 16, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'dec_sec'
+ */
+ public static int size_dec_sec() {
+ return (16 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'dec_sec'
+ */
+ public static int sizeBits_dec_sec() {
+ return 16;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: Lat_deg
+ // Field type: short
+ // Offset (bits): 64
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'Lat_deg' is signed (true).
+ */
+ public static boolean isSigned_Lat_deg() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'Lat_deg' is an array (false).
+ */
+ public static boolean isArray_Lat_deg() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'Lat_deg'
+ */
+ public static int offset_Lat_deg() {
+ return (64 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'Lat_deg'
+ */
+ public static int offsetBits_Lat_deg() {
+ return 64;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'Lat_deg'
+ */
+ public short get_Lat_deg() {
+ return (short)getUIntElement(offsetBits_Lat_deg(), 8);
+ }
+
+ /**
+ * Set the value of the field 'Lat_deg'
+ */
+ public void set_Lat_deg(short value) {
+ setUIntElement(offsetBits_Lat_deg(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'Lat_deg'
+ */
+ public static int size_Lat_deg() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'Lat_deg'
+ */
+ public static int sizeBits_Lat_deg() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: Lat_dec_min
+ // Field type: int
+ // Offset (bits): 72
+ // Size (bits): 16
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'Lat_dec_min' is signed (true).
+ */
+ public static boolean isSigned_Lat_dec_min() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'Lat_dec_min' is an array (false).
+ */
+ public static boolean isArray_Lat_dec_min() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'Lat_dec_min'
+ */
+ public static int offset_Lat_dec_min() {
+ return (72 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'Lat_dec_min'
+ */
+ public static int offsetBits_Lat_dec_min() {
+ return 72;
+ }
+
+ /**
+ * Return the value (as a int) of the field 'Lat_dec_min'
+ */
+ public int get_Lat_dec_min() {
+ return (int)getUIntElement(offsetBits_Lat_dec_min(), 16);
+ }
+
+ /**
+ * Set the value of the field 'Lat_dec_min'
+ */
+ public void set_Lat_dec_min(int value) {
+ setUIntElement(offsetBits_Lat_dec_min(), 16, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'Lat_dec_min'
+ */
+ public static int size_Lat_dec_min() {
+ return (16 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'Lat_dec_min'
+ */
+ public static int sizeBits_Lat_dec_min() {
+ return 16;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: Long_deg
+ // Field type: short
+ // Offset (bits): 88
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'Long_deg' is signed (true).
+ */
+ public static boolean isSigned_Long_deg() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'Long_deg' is an array (false).
+ */
+ public static boolean isArray_Long_deg() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'Long_deg'
+ */
+ public static int offset_Long_deg() {
+ return (88 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'Long_deg'
+ */
+ public static int offsetBits_Long_deg() {
+ return 88;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'Long_deg'
+ */
+ public short get_Long_deg() {
+ return (short)getUIntElement(offsetBits_Long_deg(), 8);
+ }
+
+ /**
+ * Set the value of the field 'Long_deg'
+ */
+ public void set_Long_deg(short value) {
+ setUIntElement(offsetBits_Long_deg(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'Long_deg'
+ */
+ public static int size_Long_deg() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'Long_deg'
+ */
+ public static int sizeBits_Long_deg() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: Long_dec_min
+ // Field type: short
+ // Offset (bits): 96
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'Long_dec_min' is signed (true).
+ */
+ public static boolean isSigned_Long_dec_min() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'Long_dec_min' is an array (false).
+ */
+ public static boolean isArray_Long_dec_min() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'Long_dec_min'
+ */
+ public static int offset_Long_dec_min() {
+ return (96 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'Long_dec_min'
+ */
+ public static int offsetBits_Long_dec_min() {
+ return 96;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'Long_dec_min'
+ */
+ public short get_Long_dec_min() {
+ return (short)getUIntElement(offsetBits_Long_dec_min(), 8);
+ }
+
+ /**
+ * Set the value of the field 'Long_dec_min'
+ */
+ public void set_Long_dec_min(short value) {
+ setUIntElement(offsetBits_Long_dec_min(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'Long_dec_min'
+ */
+ public static int size_Long_dec_min() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'Long_dec_min'
+ */
+ public static int sizeBits_Long_dec_min() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: NSEWind
+ // Field type: short
+ // Offset (bits): 104
+ // Size (bits): 8
+ /////////////////////////////////////////////////////////
+
+ /**
+ * Return whether the field 'NSEWind' is signed (true).
+ */
+ public static boolean isSigned_NSEWind() {
+ return true;
+ }
+
+ /**
+ * Return whether the field 'NSEWind' is an array (false).
+ */
+ public static boolean isArray_NSEWind() {
+ return false;
+ }
+
+ /**
+ * Return the offset (in bytes) of the field 'NSEWind'
+ */
+ public static int offset_NSEWind() {
+ return (104 / 8);
+ }
+
+ /**
+ * Return the offset (in bits) of the field 'NSEWind'
+ */
+ public static int offsetBits_NSEWind() {
+ return 104;
+ }
+
+ /**
+ * Return the value (as a short) of the field 'NSEWind'
+ */
+ public short get_NSEWind() {
+ return (short)getUIntElement(offsetBits_NSEWind(), 8);
+ }
+
+ /**
+ * Set the value of the field 'NSEWind'
+ */
+ public void set_NSEWind(short value) {
+ setUIntElement(offsetBits_NSEWind(), 8, value);
+ }
+
+ /**
+ * Return the size, in bytes, of the field 'NSEWind'
+ */
+ public static int size_NSEWind() {
+ return (8 / 8);
+ }
+
+ /**
+ * Return the size, in bits, of the field 'NSEWind'
+ */
+ public static int sizeBits_NSEWind() {
+ return 8;
+ }
+
+ /////////////////////////////////////////////////////////
+ // Accessor methods for field: temp
+ // Field type: float
+ // Offset (bits): 112
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'temp' is signed (true).
*/
public static boolean isSigned_temp() {
! return true;
}
***************
*** 261,265 ****
*/
public static int offset_temp() {
! return (32 / 8);
}
--- 786,790 ----
*/
public static int offset_temp() {
! return (112 / 8);
}
***************
*** 268,272 ****
*/
public static int offsetBits_temp() {
! return 32;
}
--- 793,797 ----
*/
public static int offsetBits_temp() {
! return 112;
}
***************
*** 301,314 ****
/////////////////////////////////////////////////////////
// Accessor methods for field: rel_hum
! // Field type: float, unsigned
! // Offset (bits): 64
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'rel_hum' is signed (false).
*/
public static boolean isSigned_rel_hum() {
! return false;
}
--- 826,839 ----
/////////////////////////////////////////////////////////
// Accessor methods for field: rel_hum
! // Field type: float
! // Offset (bits): 144
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'rel_hum' is signed (true).
*/
public static boolean isSigned_rel_hum() {
! return true;
}
***************
*** 324,328 ****
*/
public static int offset_rel_hum() {
! return (64 / 8);
}
--- 849,853 ----
*/
public static int offset_rel_hum() {
! return (144 / 8);
}
***************
*** 331,335 ****
*/
public static int offsetBits_rel_hum() {
! return 64;
}
--- 856,860 ----
*/
public static int offsetBits_rel_hum() {
! return 144;
}
***************
*** 364,377 ****
/////////////////////////////////////////////////////////
// Accessor methods for field: baro_pres
! // Field type: float, unsigned
! // Offset (bits): 96
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'baro_pres' is signed (false).
*/
public static boolean isSigned_baro_pres() {
! return false;
}
--- 889,902 ----
/////////////////////////////////////////////////////////
// Accessor methods for field: baro_pres
! // Field type: float
! // Offset (bits): 176
// Size (bits): 32
/////////////////////////////////////////////////////////
/**
! * Return whether the field 'baro_pres' is signed (true).
*/
public static boolean isSigned_baro_pres() {
! return true;
}
***************
*** 387,391 ****
*/
public static int offset_baro_pres() {
! return (96 / 8);
}
--- 912,916 ----
*/
public static int offset_baro_pres() {
! return (176 / 8);
}
***************
*** 394,398 ****
*/
public static int offsetBits_baro_pres() {
! return 96;
}
--- 919,923 ----
*/
public static int offsetBits_baro_pres() {
! return 176;
}
***************
*** 423,489 ****
public static int sizeBits_baro_pres() {
return 32;
- }
-
- /////////////////////////////////////////////////////////
- // Accessor methods for field: rss
- // Field type: int, unsigned
- // Offset (bits): 128
- // Size (bits): 16
- /////////////////////////////////////////////////////////
-
- /**
- * Return whether the field 'rss' is signed (false).
- */
- public static boolean isSigned_rss() {
- return false;
- }
-
- /**
- * Return whether the field 'rss' is an array (false).
- */
- public static boolean isArray_rss() {
- return false;
- }
-
- /**
- * Return the offset (in bytes) of the field 'rss'
- */
- public static int offset_rss() {
- return (128 / 8);
- }
-
- /**
- * Return the offset (in bits) of the field 'rss'
- */
- public static int offsetBits_rss() {
- return 128;
- }
-
- /**
- * Return the value (as a int) of the field 'rss'
- */
- public int get_rss() {
- return (int)getUIntElement(offsetBits_rss(), 16);
- }
-
- /**
- * Set the value of the field 'rss'
- */
- public void set_rss(int value) {
- setUIntElement(offsetBits_rss(), 16, value);
- }
-
- /**
- * Return the size, in bytes, of the field 'rss'
- */
- public static int size_rss() {
- return (16 / 8);
- }
-
- /**
- * Return the size, in bits, of the field 'rss'
- */
- public static int sizeBits_rss() {
- return 16;
}
--- 948,951 ----
Index: SensorPacket.java
===================================================================
RCS file: /cvsroot/firebug/firebug/project/java/src/org/firebug/SensorPacket.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SensorPacket.java 30 Jul 2003 22:17:41 -0000 1.9
--- SensorPacket.java 19 Nov 2003 00:53:59 -0000 1.10
***************
*** 85,100 ****
*/
//if (packet[2]==1 && packet[7]!=-1 && packet[5]!=1){
! if (packet[2]==1 && packet[5]!=1){
! s += " [MoteID="+Long.toString(packet[5])+ "]\n";
//Humidity
! //s += " [Humidity Data="+Long.toString(packet[12]*256)+Long.toString(packet[11])+"]";
//cnt
! s += " [Cnt#="+Long.toString(packet[7])+ "]\n";
//Temperature
//s += " [TempData="+Long.toString(packet[14]*256)+ Long.toString(packet[13])+"]";
! s += " [TempData="+Long.toString(packet[14])+ " " + Long.toString(packet[13])+"]";
! }
return s;
}
--- 85,100 ----
*/
//if (packet[2]==1 && packet[7]!=-1 && packet[5]!=1){
! //if (packet[2]==1 && packet[5]!=1){
! // s += " [MoteID="+Long.toString(packet[5])+ "]\n";
//Humidity
! s += " [Hours="+Long.toString(packet[9])+"]";
//cnt
! // s += " [Cnt#="+Long.toString(packet[7])+ "]\n";
//Temperature
//s += " [TempData="+Long.toString(packet[14]*256)+ Long.toString(packet[13])+"]";
! // s += " [TempData="+Long.toString(packet[14])+ " " + Long.toString(packet[13])+"]";
! //}
return s;
}
|
