[Firebug-cvs] mts400/apps/TestGPS_SHT gps_shtM.nc,1.3,1.4

[<do...@us...>]

Update of /cvsroot/firebug/mts400/apps/TestGPS_SHT
In directory sc8-pr-cvs1:/tmp/cvs-serv13079

Modified Files:
	gps_shtM.nc 
Log Message:
GPS and SHT11 now work in the same application.

Index: gps_shtM.nc
===================================================================
RCS file: /cvsroot/firebug/mts400/apps/TestGPS_SHT/gps_shtM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gps_shtM.nc	18 Nov 2003 22:45:10 -0000	1.3
--- gps_shtM.nc	21 Nov 2003 01:03:49 -0000	1.4
***************
*** 92,96 ****
  
        call GPSTimer.start(TIMER_REPEAT, 10000) ;
!       //call SHTTimer.start(TIMER_REPEAT, 2000) ;
        return SUCCESS;
     }
--- 92,96 ----
  
        call GPSTimer.start(TIMER_REPEAT, 10000) ;
!       call SHTTimer.start(TIMER_REPEAT, 2000) ;
        return SUCCESS;
     }
***************
*** 146,152 ****
  
     event result_t SHTTimer.fired() {
       
        call Leds.redToggle();
!       //call TempHumControl.start();
        return SUCCESS;
     }
--- 146,157 ----
  
     event result_t SHTTimer.fired() {
+ 
+       if (gps_state == GPS_WORKING) {
+          SODbg(DBG_USR2, "gps_newM.SHTTimer.fired(): GPS_WORKING\n");
+          return FAIL;
+       }
       
        call Leds.redToggle();
!       call TempHumControl.start();
        return SUCCESS;
     }
***************
*** 275,279 ****
          /** Already written out one message. */
           static uint16_t msg_count = 1; 
!          if (msg_count == 2) {
              atomic {
                 gps_state = GPS_FINISHED;
--- 280,284 ----
          /** Already written out one message. */
           static uint16_t msg_count = 1; 
!          if (msg_count == 5) {
              atomic {
                 gps_state = GPS_FINISHED;
***************
*** 359,366 ****
--- 364,374 ----
    
    event result_t TempHumControl.initDone() {
+     SODbg(DBG_USR2, "gps_shtM.TempHumControl.initDone()\n")
      return SUCCESS;
    }
  
    event result_t TempHumControl.stopDone() {
+ 
+     SODbg(DBG_USR2, "gps_shtM.TempHumControl.stopDone()\n")
  
      state = HUMIDITY_DONE;