[Firebug-cvs] mts400/apps/TestGPS_SHT gps_shtM.nc,1.1,1.2

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

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

Modified Files:
	gps_shtM.nc 
Log Message:
Instrumenting the mica switch and adding 
test programs to monitor control of flow.

Index: gps_shtM.nc
===================================================================
RCS file: /cvsroot/firebug/mts400/apps/TestGPS_SHT/gps_shtM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gps_shtM.nc	13 Nov 2003 18:35:22 -0000	1.1
--- gps_shtM.nc	15 Nov 2003 02:00:27 -0000	1.2
***************
*** 62,65 ****
--- 62,67 ----
           WAIT_SWITCH_OFF, TIMER, GPS_WORKING, GPS_FINISHED, HUMIDITY_DONE};
  
+  
+ 
     uint16_t HumData;
  
***************
*** 71,75 ****
       /** Control.init in GpsPacket.nc */
        call GpsControl.init();      
!       call TempHumControl.init();    //init Sensirion
        return SUCCESS;
     }
--- 73,77 ----
       /** Control.init in GpsPacket.nc */
        call GpsControl.init();      
!       call TempHumControl.init(); 
        return SUCCESS;
     }
***************
*** 86,91 ****
         */
        call GpsControl.start();
        call GPSTimer.start(TIMER_REPEAT, 10000) ;
!       call SHTTimer.start(TIMER_REPEAT, 2000) ;
        return SUCCESS;
     }
--- 88,96 ----
         */
        call GpsControl.start();
+ 
+       call TempHumControl.start();
+ 
        call GPSTimer.start(TIMER_REPEAT, 10000) ;
!       //call SHTTimer.start(TIMER_REPEAT, 2000) ;
        return SUCCESS;
     }
***************
*** 107,110 ****
--- 112,117 ----
           SODbg(DBG_USR2, "gps_newM.StdControl.stop(): GPS sensor powered off. \n");
        }
+       //call TempHumControl.start();
+ 
     }
  
***************
*** 120,123 ****
--- 127,132 ----
        }
  
+       //call TempHumControl.stop();
+ 
        call Leds.greenToggle();
  
***************
*** 139,143 ****
       
        call Leds.redToggle();
!       call TempHumControl.start();
        return SUCCESS;
     }
--- 148,152 ----
       
        call Leds.redToggle();
!       //call TempHumControl.start();
        return SUCCESS;
     }
***************
*** 149,153 ****
  
     /** FIXME: Make sure we don't need the startDone, stopDone
!     * calls.
      */
     event result_t PowerSwitch.setDone(bool local_result) {
--- 158,162 ----
  
     /** FIXME: Make sure we don't need the startDone, stopDone
!     * calls.  Where is this called from?
      */
     event result_t PowerSwitch.setDone(bool local_result) {
***************
*** 323,327 ****
        }
        fTemp = 10*fTemp; 
!       SODbg(DBG_USR2, "Humidity: Temp(adc): %i  Humidity(adc): %i  Temp(degCx10): %i  Humidity(%): %i \n",
  	   data,HumData,(int)fTemp, (int)fHumidity);
  
--- 332,336 ----
        }
        fTemp = 10*fTemp; 
!       SODbg(DBG_USR2, "gps_shtM.Humidity: Temp(adc): %i  Humidity(adc): %i  Temp(degCx10): %i  Humidity(%): %i \n",
  	   data,HumData,(int)fTemp, (int)fHumidity);
  
***************
*** 334,344 ****
    async event result_t Humidity.dataReady(uint16_t data) {
  
      atomic { 
         HumData = data;
!     }
      return call Temperature.getData();
    }
  
    event result_t TempHumControl.startDone() {
      call Humidity.getData();
      return SUCCESS;
--- 343,357 ----
    async event result_t Humidity.dataReady(uint16_t data) {
  
+     SODbg(DBG_USR2, "gsp_shtM.Humidity.dataReady()\n")
+ 
      atomic { 
         HumData = data;
!     }    
      return call Temperature.getData();
    }
  
    event result_t TempHumControl.startDone() {
+ 
+     SODbg(DBG_USR2, "gps_shtM.TempHumControl.startDone()\n")
      call Humidity.getData();
      return SUCCESS;
***************
*** 357,360 ****
--- 370,375 ----
    event result_t HumidityError.error(uint8_t token) {
  
+     SODbg(DBG_USR2, "gps_shtM.HumidityError.error()\n")
+ 
      call Leds.redOff();
      call Leds.yellowOff();
***************
*** 366,369 ****
--- 381,385 ----
    event result_t TemperatureError.error(uint8_t token) {
  
+     SODbg(DBG_USR2, "gps_shtM.Temperature.error()\n")
      call TempHumControl.stop();
      call Leds.yellowOff();