[Firebug-cvs] fireboard/fireboard/sensors/leadtek9546 gps_driverM.nc,1.2,1.3 ADCError.nc,1.1.1.1,NONE

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

Update of /cvsroot/firebug/fireboard/fireboard/sensors/leadtek9546
In directory sc8-pr-cvs1:/tmp/cvs-serv6882

Modified Files:
	gps_driverM.nc 
Removed Files:
	ADCError.nc 
Log Message:
Removed unneeded adc file.

Index: gps_driverM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/fireboard/sensors/leadtek9546/gps_driverM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gps_driverM.nc	14 Jan 2004 14:05:34 -0000	1.2
--- gps_driverM.nc	14 Jan 2004 14:21:46 -0000	1.3
***************
*** 46,51 ****
        interface Leds;
  
-       interface Timer         as GPSTimer;
- 
        interface StdControl    as SwitchControl;
        interface Switch        as PowerSwitch;
--- 46,49 ----
***************
*** 70,78 ****
  
     enum {IDLE, BUSY, BUSY_0, BUSY_1, GET_SAMPLE_0, GET_SAMPLE_1,
!          //OPENSCK, OPENDATA, CLOSESCK, CLOSEDATA,  
!          POWEROFF,
! 	 //MAIN_SWITCH_ON, MAIN_SWITCH_OFF, WAIT_SWITCH_ON, WAIT_SWITCH_OFF,
!          TIMER, GPS_WORKING, GPS_FINISHED};
! 
  
  
--- 68,72 ----
  
     enum {IDLE, BUSY, BUSY_0, BUSY_1, GET_SAMPLE_0, GET_SAMPLE_1,
!          POWEROFF, TIMER, GPS_WORKING, GPS_FINISHED};
  
  
***************
*** 96,101 ****
        call GpsControl.start();
        SODbg(DBG_USR2, "gps_driverM.StdControl.start()\n");
-       // Timer is internal to the GPS sensor.
-       //call readGps();
        return SUCCESS;
     }
--- 90,93 ----
***************
*** 103,110 ****
     command result_t StdControl.stop() {
  
-       /** Turn the timer off so that it doesn't fire any 
-        * sensor readings. Timer.stop always returns success.
-        */
-       //call GPSTimer.stop();
        return SUCCESS;
     }
--- 95,98 ----
***************
*** 138,149 ****
     }
  
- 
-    event result_t GPSTimer.fired() {
- 
-       call readGps();
-       return SUCCESS;
-    }
- 
- 
     event result_t PowerSwitch.getDone(char value) {
        return SUCCESS;
--- 126,129 ----
***************
*** 304,308 ****
     event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) {
  
!      //uint8_t i;
        GPS_MsgPtr gps_data = (GPS_MsgPtr)data;
  
--- 284,288 ----
     event TOS_MsgPtr GpsReceive.receive(TOS_MsgPtr data) {
  
!       //uint8_t i;
        GPS_MsgPtr gps_data = (GPS_MsgPtr)data;
  
***************
*** 314,317 ****
--- 294,302 ----
        call Leds.greenToggle();
  
+       signal Sensor.dataReady(gps_data);
+ 
+       return SUCCESS;
+ 
+       //Don't worry about this for now.
        if ((call isGGA(gps_data->data))) {
            SODbg(DBG_USR2, "gps_driverM.GpsReceive.receive()  GGA Data\n");     
***************
*** 364,371 ****
     event result_t GpsCmd.SwitchesSet(uint8_t PowerState) {
  
-      //char tmp[] = {"Foo"};
- 
       //SODbg(DBG_USR2, "gps_new.GpsCmd.SwitchesSet(): PowerState: %i \n\n", PowerState);
!      //SODbg(DBG_USR2, "gps_driverM.GpsCmd.SwitchesSet(): dummy string: %s \n", tmp);
        call Leds.yellowOn();
        call Leds.redOff();
--- 349,354 ----
     event result_t GpsCmd.SwitchesSet(uint8_t PowerState) {
  
       //SODbg(DBG_USR2, "gps_new.GpsCmd.SwitchesSet(): PowerState: %i \n\n", PowerState);
! 
        call Leds.yellowOn();
        call Leds.redOff();

--- ADCError.nc DELETED ---