[Firebug-cvs] fireboard/beta/tools/src/xlisten/boards fireboard.c,1.8,1.9 pg_test.c,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25025/boards

Modified Files:
	fireboard.c pg_test.c 
Log Message:
Moved GPS logging out of fireboard code.

Index: pg_test.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/pg_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** pg_test.c	1 Jun 2005 01:46:21 -0000	1.1
--- pg_test.c	1 Jun 2005 13:14:19 -0000	1.2
***************
*** 5,8 ****
--- 5,10 ----
   */
  
+ #include <NMEA.h>
+ 
  #include "../xdb.h"
  #include "../xsensors.h"
***************
*** 126,127 ****
--- 128,165 ----
  }
  
+ 
+ // TODO: Switch this to non-xbow specific packet.
+ void
+ fb_pg_log_gga_data(XbowSensorboardPacket *packet) {
+ 
+   GGA_Data * data = (GGA_Data*)packet->data;
+   sprintf(pg_statement, 
+ 	  "INSERT into %s "
+ 	  "(result_time,nodeid,parent,Hours,Minutes,seconds,"
+ 	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
+ 	  "NSEWind,Fixed)"
+ 	  " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
+ 	  "cumulative_location",
+ 	  packet->node_id, packet->parent, 
+ 	  data->hours, data->minutes, data->dec_sec,
+ 	  data->Lat_deg, data->Lat_dec_min,
+ 	  data->Long_deg, data->Long_dec_min, data->NSEWind);	
+ 
+   xdb_execute(pg_statement);
+ 
+   // TODO: This needs to be changed to a REPLACE statement.
+   sprintf(pg_statement, 
+ 	  "INSERT into %s "
+ 	  "(result_time,nodeid,parent,Hours,Minutes,seconds,"
+ 	  "Latitudedegree,Latitudeminutes,Longitudedegree,Longitudeminute,"
+ 	  "NSEWind,Fixed)"
+ 	  " values (now(),%u,%u,%u,%u,%f,%u,%f,%u,%f,%u)", 
+ 	  "current_location",
+ 	  packet->node_id, packet->parent, 
+ 	  data->hours, data->minutes, data->dec_sec,
+ 	  data->Lat_deg, data->Lat_dec_min,
+ 	  data->Long_deg, data->Long_dec_min, data->NSEWind);	
+ 
+   xdb_execute(pg_statement);
+ 
+ }

Index: fireboard.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/src/xlisten/boards/fireboard.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** fireboard.c	1 Jun 2005 01:46:21 -0000	1.8
--- fireboard.c	1 Jun 2005 13:14:19 -0000	1.9
***************
*** 646,649 ****
--- 646,650 ----
      XSensorMTS420GPSData *data;
  
+     // TODO: This should be GGA_Data *?
      data = (XSensorMTS420GPSData *) packet->data;
      printf("FIREBOARD [gps data converted to engineering units]:\n"
***************
*** 850,853 ****
--- 851,857 ----
    }
    case AM_GGA_DATA:{
+ 
+     fb_pg_log_gga_data(packet);
+     /*
      GGA_Data * data = (GGA_Data*)packet->data;
      sprintf(command, 
***************
*** 862,867 ****
  	    data->hours, data->minutes, data->dec_sec,
  	    data->Lat_deg, data->Lat_dec_min,
! 	    data->Long_deg, data->Long_dec_min, data->NSEWind);	
      break;
    }
    case 3: {
--- 866,873 ----
  	    data->hours, data->minutes, data->dec_sec,
  	    data->Lat_deg, data->Lat_dec_min,
! 	    data->Long_deg, data->Long_dec_min, data->NSEWind);
      break;
+     */
+     return;
    }
    case 3: {