[Firebug-cvs] fireboard/beta/apps/XSensorMTS400 TestMTS400M.nc,1.8,1.9

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

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

Modified Files:
	TestMTS400M.nc 
Log Message:
gga processing is complete.

Index: TestMTS400M.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestMTS400M.nc	27 May 2005 00:38:13 -0000	1.8
--- TestMTS400M.nc	27 May 2005 20:18:07 -0000	1.9
***************
*** 542,552 ****
    event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) {  
        
!     uint8_t i,j,m,length,NS,EW;
!     uint16_t k;
      uint32_t temp;
-     bool end_of_field;
      char * leadtek_string;
-     char *pdata;
-     float dec_secs,dec_min;
      GGA_Data gga_data = {0};
      GGA_Data * gga_data_ptr;
--- 542,548 ----
    event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) {  
        
!     uint8_t NS,EW;
      uint32_t temp;
      char * leadtek_string;
      GGA_Data gga_data = {0};
      GGA_Data * gga_data_ptr;
***************
*** 576,579 ****
--- 572,579 ----
      // Pack everything into xbow structs so that 
      // xlisten can process it.
+     // TODO: Write a module that translates firebug 
+     // structs into xbow structs, along with a dummy
+     // module that can be wired in if the xbow 
+     // translation is not needed.
      pack->xData.dataGps.hour   = gga_data_ptr->hours;
      pack->xData.dataGps.minute = gga_data_ptr->minutes;
***************
*** 586,597 ****
      temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000);
      pack->xData.dataGps.long_dec_min= temp;
! 
!     NS = (gga_fields[3][0] == 'N') ? 1 : 0;
!     EW = (gga_fields[5][0] == 'W') ? 1 : 0;
!     pack->xData.dataGps.nsewind= EW | (NS<<4); // eg. Status= 000N000E = 00010000
        
      if (gps_pwr_on)call GpsCmd.TxRxSwitch(0); // stop receive from gpsuart
      atomic state = GPS_DONE;    
!     iNextPacketID = 2;  // issue gga packet xmit
      WaitingForSend =  TRUE;
      
--- 586,597 ----
      temp = (uint32_t)(gga_data_ptr->Long_dec_min * 10000);
      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;    
! 
!     // TODO: Change this to AM_TYPE
!     //iNextPacketID = 2;  // issue gga packet xmit
!     iNextPacketID = AM_GGA_DATA;  // issue gga packet xmit
      WaitingForSend =  TRUE;
      
***************
*** 605,608 ****
--- 605,609 ----
    }
    
+ 
    event result_t GpsCmd.TxRxSet(uint8_t rtstate) {
      // gps tx/rx switches set to on or off