[Firebug-cvs] firebug/project/src/multihop CollectDataMFB.nc,1.12,1.13

[<che...@us...>]

Update of /cvsroot/firebug/firebug/project/src/multihop
In directory sc8-pr-cvs1:/tmp/cvs-serv17591

Modified Files:
	CollectDataMFB.nc 
Log Message:
better than blank fields

Index: CollectDataMFB.nc
===================================================================
RCS file: /cvsroot/firebug/firebug/project/src/multihop/CollectDataMFB.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CollectDataMFB.nc	19 Nov 2003 00:52:30 -0000	1.12
--- CollectDataMFB.nc	22 Nov 2003 08:53:50 -0000	1.13
***************
*** 236,243 ****
    
       int8_t gga_string[GPS_MSG_LENGTH];
!      bool gga_read = FALSE;
!      bool gga_read_done = FALSE;
       uint16_t i = 0;
!      uint8_t j = 0;
       uint8_t k = 0;
        
--- 236,243 ----
    
       int8_t gga_string[GPS_MSG_LENGTH];
!      //bool gga_read = FALSE;
!      //bool gga_read_done = FALSE;
       uint16_t i = 0;
!      //uint8_t j = 0;
       uint8_t k = 0;
        
***************
*** 245,251 ****
        call Leds.greenToggle();
  
!       
!       if(gps_data->data[i+3] == 'G' && gps_data->data[i+4] == 'G' && gps_data->data[i+5] == 'A' && gps_done == TRUE) {
  
        while (!gga_read_done) {
           if(gps_data->data[i+3] == 'G') {
--- 245,262 ----
        call Leds.greenToggle();
  
!       if(gps_data->data[3] == 'G' && gps_data->data[4] == 'G' && gps_data->data[5] == 'A' && gps_done == TRUE) {
! 
!         for (k = 0; k <= gps_data->length ; k++) UARTPutChar(gps_data->data[k]);
!         gps_done = FALSE;
! 
!         for (i = 0; i <= gps_data->length ; i++)
!           gga_string[i] = gps_data->data[i];
!         
!         call parseGPS(gga_string, i);
  
+       }
+ 
+       /*
+       //if(gps_data->data[i+3] == 'G' && gps_data->data[i+4] == 'G' && gps_data->data[i+5] == 'A' && gps_done == TRUE) {
        while (!gga_read_done) {
           if(gps_data->data[i+3] == 'G') {
***************
*** 259,263 ****
              }
           }
- 
           call Leds.redToggle();
           if(gps_data->data[i] == GPS_END_MSG) {
--- 270,273 ----
***************
*** 266,270 ****
                //  SODbg(DBG_USR2, "GPS Power Off\n");
                //}
-               
                call parseGPS(gga_string, j);
                 gga_read = FALSE;
--- 276,279 ----
***************
*** 272,286 ****
              }
           }
- 
           if(gga_read) {
              gga_string[j] = gps_data->data[i];
              j++;
           }
- 
           i++;
!       }
!       
!       }
! 
        return data;
     }
--- 281,292 ----
              }
           }
           if(gga_read) {
              gga_string[j] = gps_data->data[i];
              j++;
           }
           i++;
!       }//while
!       //}
!       */
        return data;
     }
***************
*** 307,314 ****
  
  //***DEBUG: Output NMEA message***
! uint16_t q;
! SODbg(DBG_USR2, "parse GPS: \n");
! for(q=0; q<length; q++) UARTPutChar(gga_string[q]);
! SODbg(DBG_USR2, "\n");
  //********************************
  
--- 313,320 ----
  
  //***DEBUG: Output NMEA message***
!         uint16_t q;
!         SODbg(DBG_USR2, "parse GPS: \n");
!         for(q=0; q<length; q++) UARTPutChar(gga_string[q]);
!         SODbg(DBG_USR2, "\n");
  //********************************
  
***************
*** 338,342 ****
           i++;
        }
!    
        call logGPS(gga_fields); 
     return SUCCESS;
--- 344,348 ----
           i++;
        }
!       call Leds.redToggle();
        call logGPS(gga_fields); 
     return SUCCESS;
***************
*** 388,392 ****
        SODbg(DBG_USR2, "Long_deg %i:\n", pLong_deg);
  
!       pLong_dec_min = 100000*(gga_fields[4][3]-'0') + 10000*(gga_fields[4][4]-'0') + 1000*(gga_fields[4][5]-'0') + 100*(gga_fields[4][6]-'0') + 10*(gga_fields[4][7]-'0') + (gga_fields[4][8]-'0'); 
        SODbg(DBG_USR2, "Long_dec_min: %i,%i\n", (pLong_dec_min)>>8, pLong_dec_min);
  
--- 394,398 ----
        SODbg(DBG_USR2, "Long_deg %i:\n", pLong_deg);
  
!       pLong_dec_min = 100000*(gga_fields[4][3]-'0') + 10000*(gga_fields[4][4]-'0') + 1000*(gga_fields[4][5]-'0') + 100*(gga_fields[4][6]-'0') + 10*(gga_fields[4][7]-'0') + (gga_fields[4][8]-'0');
        SODbg(DBG_USR2, "Long_dec_min: %i,%i\n", (pLong_dec_min)>>8, pLong_dec_min);
  
***************
*** 399,406 ****
        SODbg(DBG_USR2, "nos: %i\n", nos);
  
        if(call GpsCmd.PowerSwitch(0)) {
              SODbg(DBG_USR2, "GPS Power Off\n");
        }
- 
  
        call Timer2.start(TIMER_ONE_SHOT,300);
--- 405,418 ----
        SODbg(DBG_USR2, "nos: %i\n", nos);
  
+       if (pLat_deg == 0 || pLong_deg == 0){
+         //if (pHours == 23 && pMinutes == 59 && gga_fields[6][0]== '0'){
+         gps_done = TRUE;
+         SODbg(DBG_USR2, "GPS NOT AVAILABLE:\n");
+         return SUCCESS;
+       }
+ 
        if(call GpsCmd.PowerSwitch(0)) {
              SODbg(DBG_USR2, "GPS Power Off\n");
        }
  
        call Timer2.start(TIMER_ONE_SHOT,300);