[Firebug-cvs] fireboard/beta/tos/sensorboards/mts400 GpsPacket.nc,1.5,1.6

[Michael N. <mne...@us...>]

Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19029

Modified Files:
	GpsPacket.nc 
Log Message:
Add missing call to init I2C services

Index: GpsPacket.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/GpsPacket.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GpsPacket.nc	17 Aug 2005 22:48:55 -0000	1.5
--- GpsPacket.nc	8 Sep 2005 23:37:22 -0000	1.6
***************
*** 181,185 ****
  	    rxLength = GPS_DATA_LENGTH;
  	}
! 	call setGPSmode(TRUE);		// setting SiRF mode
  	return call ByteControl.init();
      }
--- 181,186 ----
  	    rxLength = GPS_DATA_LENGTH;
  	}
! 	call setGPSmode(FALSE);		// setting SiRF mode
! 	call SwitchControl.init();
  	return call ByteControl.init();
      }
***************
*** 189,193 ****
  	// The switch control system is used by the GPS which depends on
  	// the fact that it will never be turned off by anyone else. 
! 	call SwitchControl.start();
  	return call ByteControl.start();
      }
--- 190,194 ----
  	// The switch control system is used by the GPS which depends on
  	// the fact that it will never be turned off by anyone else. 
!         call SwitchControl.start();
  	return call ByteControl.start();
      }
***************
*** 531,537 ****
  	    if (call Switch1.set(MICAWB_GPS_POWER,(gpsPowerStatus) ? 0 : 1) == SUCCESS) {
  		gpsSwitchState = GPS_PWR_SWITCH_WAIT;
  	    };
! 	    return SUCCESS;
  	};
  	return FAIL;
      } 
--- 532,541 ----
  	    if (call Switch1.set(MICAWB_GPS_POWER,(gpsPowerStatus) ? 0 : 1) == SUCCESS) {
  		gpsSwitchState = GPS_PWR_SWITCH_WAIT;
+ 		return SUCCESS;
  	    };
! 	    SODbg(DBG_USR2, "GPS PowerSwitch Switch1 set failed\n");
! 	    return FAIL;
  	};
+ 	SODbg(DBG_USR2, "PowerSwitch busy\n");
  	return FAIL;
      } 
***************
*** 543,547 ****
  	    if (call Switch1.set(MICAWB_GPS_ENABLE ,gpsPowerStatus) == SUCCESS) {
  		gpsSwitchState = GPS_EN_SWITCH_WAIT;
! 	    }
  	}
  	else if (gpsSwitchState == GPS_EN_SWITCH_WAIT) {
--- 547,553 ----
  	    if (call Switch1.set(MICAWB_GPS_ENABLE ,gpsPowerStatus) == SUCCESS) {
  		gpsSwitchState = GPS_EN_SWITCH_WAIT;
! 	    } else {
! 	       SODbg(DBG_USR2, "Switch1.setDone could not turn enable off\n");
! 	    };
  	}
  	else if (gpsSwitchState == GPS_EN_SWITCH_WAIT) {
***************
*** 595,599 ****
  	}
  	else if (gpsSwitchState == GPS_RX_SWITCH_WAIT) {
- 	    //      SODbg(DBG_USR2, "GpsPacket: all switches set \n"); 
  	    gpsSwitchState = GPS_SWITCH_IDLE;
  	    signal GpsCmd.TxRxSet(gpsPowerStatus);
--- 601,604 ----