[Firebug-cvs] fireboard/beta/apps/GPS2 TestMTS400M.nc,1.1,1.2

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

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

Modified Files:
	TestMTS400M.nc 
Log Message:
Removed some cpp defines, refactored 
nmea handling code.

Index: TestMTS400M.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/apps/GPS2/TestMTS400M.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMTS400M.nc	19 Sep 2005 17:41:05 -0000	1.1
--- TestMTS400M.nc	19 Sep 2005 21:36:55 -0000	1.2
***************
*** 42,45 ****
--- 42,48 ----
  module TestMTS400M {
     provides interface StdControl;
+    provides command result_t nmea_parse();
+     
+ 
     uses {
  
***************
*** 311,314 ****
--- 314,347 ----
  
  
+ 
+   // TODO: Move this into the NMEA module.
+   command result_t nmea_parse() {
+ 
+ #if 0
+     if (is_gga_string_m(leadtek_string)) {
+       call nmea.gga_parse(gga_data_ptr, leadtek_string);
+     } else if (is_gsa_string(pGPSdata->data)) {
+       call nmea.gsa_parse(gsa_data_ptr, leadtek_string);
+     } else if (is_gva_string(data)) {
+       call nmea.gsv_parse(gsv_data_ptr, leadtek_string);
+     } else if (is_gll_string(data)) {
+       call nmea.gll_parse(gll_data_ptr, leadtek_string);
+     } else if (is_rmc_string(data)) {
+       call nmea.rmc_parse(rmc_data_ptr, leadtek_string);
+     } else if (is_vtg_string(data)) {
+       call nmea.vtg_parse(vtg_data_ptr, leadtek_string);
+     } else if (is_mss_string(data)) {
+       call nmea.mss_parse(mss_data_ptr, leadtek_string);
+     } else if (is_ltc_string(data)) {
+       call nmea.ltc_parse(ltc_data_ptr, leadtek_string);
+     } else {
+       // signal error
+     };
+ #endif
+     return SUCCESS;
+   }
+ 
+ 
+ 
     // When a packet is received from the GPS we retain a pointer to
     // that packet and hand a pointer to another buffer back to the
***************
*** 318,321 ****
--- 351,356 ----
     static GPS_Msg *pGPSdata = &gpsData; // buffer to dump
  
+ 
+ 
     // Report and handle the content of a message that came in from the
     // GPS and is stored inpGGAdata.
***************
*** 327,352 ****
        if (leadtek_string[0] == '$') {
  	 dumpGPSmsg(leadtek_string,MIN(sizeof(pGPSdata->data),pGPSdata->length));
! 
! #if 0
! 	 if (is_gga_string_m(leadtek_string)) {
! 	    call nmea.gga_parse(gga_data_ptr, leadtek_string);
! 	 } else if (is_gsa_string(pGPSdata->data)) {
! 	    call nmea.gsa_parse(gsa_data_ptr, leadtek_string);
! 	 } else if (is_gva_string(data)) {
! 	    call nmea.gsv_parse(gsv_data_ptr, leadtek_string);
! 	 } else if (is_gll_string(data)) {
! 	    call nmea.gll_parse(gll_data_ptr, leadtek_string);
! 	 } else if (is_rmc_string(data)) {
! 	    call nmea.rmc_parse(rmc_data_ptr, leadtek_string);
! 	 } else if (is_vtg_string(data)) {
! 	    call nmea.vtg_parse(vtg_data_ptr, leadtek_string);
! 	 } else if (is_mss_string(data)) {
! 	    call nmea.mss_parse(mss_data_ptr, leadtek_string);
! 	 } else if (is_ltc_string(data)) {
! 	    call nmea.ltc_parse(ltc_data_ptr, leadtek_string);
! 	 } else {
! 	    // signal error
! 	 };
! #endif
        };
  
--- 362,366 ----
        if (leadtek_string[0] == '$') {
  	 dumpGPSmsg(leadtek_string,MIN(sizeof(pGPSdata->data),pGPSdata->length));
! 	 call nmea_parse();
        };
  
***************
*** 414,415 ****
--- 428,430 ----
  
  }
+