[Firebug-cvs] fireboard/beta/apps/XSensorMTS400 TestMTS400M.nc,1.10,1.11 sensorboardApp.h,1.4,1.5

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

Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4221

Modified Files:
	TestMTS400M.nc sensorboardApp.h 
Log Message:
Test code now returns firebug gga code.

Index: TestMTS400M.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestMTS400M.nc	27 May 2005 20:28:02 -0000	1.10
--- TestMTS400M.nc	27 May 2005 22:22:50 -0000	1.11
***************
*** 543,548 ****
        
      uint32_t temp;
-     char * leadtek_string;
      GGA_Data gga_data = {0};
      GGA_Data * gga_data_ptr;
  
--- 543,548 ----
        
      uint32_t temp;
      GGA_Data gga_data = {0};
+     char * leadtek_string;
      GGA_Data * gga_data_ptr;
  
***************
*** 550,555 ****
      GPS_MsgPtr gps_data = (GPS_MsgPtr)data;
  
!     gga_data_ptr = &gga_data;
  
  
      // if gps have been scaned then stop receiving gps uart packet
--- 550,556 ----
      GPS_MsgPtr gps_data = (GPS_MsgPtr)data;
  
!     //gga_data_ptr = &gga_data;
  
+     gga_data_ptr = &(pack->xData.gga_data);
  
      // if gps have been scaned then stop receiving gps uart packet
***************
*** 565,572 ****
      }
    
-     if (gga_data_ptr->num_sats > 2) {
-       pack->xData.dataGps.fixed = 1; 
-     }   
  
      // Pack everything into xbow structs so that 
      // xlisten can process it.
--- 566,571 ----
      }
    
  
+ #if 0
      // Pack everything into xbow structs so that 
      // xlisten can process it.
***************
*** 586,590 ****
      pack->xData.dataGps.long_dec_min= temp;
      pack->xData.dataGps.nsewind = gga_data_ptr->NSEWind;
!       
      if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart
      atomic state = GPS_DONE;    
--- 585,590 ----
      pack->xData.dataGps.long_dec_min= temp;
      pack->xData.dataGps.nsewind = gga_data_ptr->NSEWind;
! #endif
!  
      if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart
      atomic state = GPS_DONE;    

Index: sensorboardApp.h
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/sensorboardApp.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sensorboardApp.h	27 May 2005 00:38:13 -0000	1.4
--- sensorboardApp.h	27 May 2005 22:22:50 -0000	1.5
***************
*** 4,7 ****
--- 4,8 ----
  #define SENSORBOARDAPP_H
  
+ #include "NMEA.h"
  
  typedef struct XSensorHeader {
***************
*** 55,58 ****
--- 56,60 ----
       XSensorMTS400DataMsg    data1;
       GGAMsg    dataGps;
+     GGA_Data gga_data;
    }xData;
  } __attribute__ ((packed)) XDataMsg;