[Firebug-cvs] firebug/web admin.html,1.9,1.10 fbmsg.html,1.3,1.4

[<do...@us...>]

Update of /cvsroot/firebug/firebug/web
In directory sc8-pr-cvs1:/tmp/cvs-serv17926

Modified Files:
	admin.html fbmsg.html 
Log Message:
Updated mysql and msg web pages.

Index: admin.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/admin.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** admin.html	14 May 2003 21:36:48 -0000	1.9
--- admin.html	10 Jul 2003 21:08:13 -0000	1.10
***************
*** 115,122 ****
      </ul>
      
!     <h3>An example mysql table for mote data</h3>
  
  
      <center>
        <table class="db_schema">
  	<tr>
--- 115,134 ----
      </ul>
      
!     <h3>MySQL tables for mote data</h3>
  
  
+     <p>
+       We use several different tables for mote data collection.
+       Since FireBug motes are not mobile, location data is recorded
+       only once.  Sensor data is recorded into two tables.  The
+       first table accumulates times histories of the data by
+       recording the data from each packet received.   The second
+       table keeps a record of the most recent data received from
+       each mote, which saves querying the first table for real time
+       updates.
+     </p>
+ 
      <center>
+       <h4>Sensor data table</h4>
        <table class="db_schema">
  	<tr>
***************
*** 126,129 ****
--- 138,142 ----
  	  <td>rel_hum</td>
  	  <td>baro_pres</td>
+ 	  <td>cnt</td>
  	</tr>
  	<tr>
***************
*** 135,138 ****
--- 148,152 ----
  	  <td>FLOAT</td>
  	  <td>FLOAT</td>
+ 	  <td>INTEGER</td>
  	  <td></td>
  	</tr>
***************
*** 143,146 ****
--- 157,161 ----
  
      <center>
+       <h4>Sensor location table</h4>
        <table class="db_schema">
  	<tr>
***************
*** 160,163 ****
--- 175,179 ----
  
  
+       <h3>Creating the tables</h3>
      <p>
  
***************
*** 175,184 ****
        <pre>
        CREATE TABLE example (mote_id   INTEGER,
-                             longitude FLOAT,
-                             latitude  FLOAT,
                              time      DECIMAL(9,3),
                              temp      FLOAT,
                              rel_hum   FLOAT,
!                             baro_pres FLOAT);
        </pre>
  
--- 191,199 ----
        <pre>
        CREATE TABLE example (mote_id   INTEGER,
                              time      DECIMAL(9,3),
                              temp      FLOAT,
                              rel_hum   FLOAT,
!                             baro_pres FLOAT,
!                             cnt       INTEGER);
        </pre>
  
***************
*** 204,222 ****
        <pre>
        CREATE TABLE example_current (mote_id   INTEGER,
-                                     longitude FLOAT,
-                                     latitude  FLOAT,
                                      time      DECIMAL(9,3),
                                      temp      FLOAT,
                                      rel_hum   FLOAT,
!                                     baro_pres FLOAT);
        </pre>
        <pre>
        CREATE TABLE example_cumulative (mote_id   INTEGER,
-                                        longitude FLOAT,
-                                        latitude  FLOAT,
                                         time      DECIMAL(9,3),
                                         temp      FLOAT,
                                         rel_hum   FLOAT,
!                                        baro_pres FLOAT);
        </pre>
      <p>
--- 219,235 ----
        <pre>
        CREATE TABLE example_current (mote_id   INTEGER,
                                      time      DECIMAL(9,3),
                                      temp      FLOAT,
                                      rel_hum   FLOAT,
!                                     baro_pres FLOAT,
!                                     cnt       INTEGER);
        </pre>
        <pre>
        CREATE TABLE example_cumulative (mote_id   INTEGER,
                                         time      DECIMAL(9,3),
                                         temp      FLOAT,
                                         rel_hum   FLOAT,
!                                        baro_pres FLOAT,
!                                        cnt       INTEGER);
        </pre>
      <p>

Index: fbmsg.html
===================================================================
RCS file: /cvsroot/firebug/firebug/web/fbmsg.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** fbmsg.html	22 May 2003 22:20:17 -0000	1.3
--- fbmsg.html	10 Jul 2003 21:08:13 -0000	1.4
***************
*** 35,39 ****
              <tr class="msg_header">
  	      <td colspan=4><b>TOS HEADER</b></td>
! 	      <td colspan=2><b>MH6 INFO</b></td>
  	      <td colspan=1><b>FIREBUG DATA</b></td>
  	    </tr>
--- 35,39 ----
              <tr class="msg_header">
  	      <td colspan=4><b>TOS HEADER</b></td>
! 	      <td colspan=2><b>BLAST INFO</b></td>
  	      <td colspan=1><b>FIREBUG DATA</b></td>
  	    </tr>