[Gcblue-commits] gcb_wx/scripts AirMissions.py, 1.1, 1.2 Landing.py, 1.4, 1.5

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/scripts
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23008/scripts

Modified Files:
	AirMissions.py Landing.py 
Log Message:


Index: AirMissions.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/AirMissions.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AirMissions.py	24 Oct 2006 01:34:37 -0000	1.1
--- AirMissions.py	23 Nov 2006 00:08:15 -0000	1.2
***************
*** 32,39 ****
  
      # if low on fuel or out of ammo, rtb
!     if ((UI.GetFuel() < 0.1) or (not UI.IsEquippedForTargetType(0x0020))):
          UI.DeleteTask('EngageAll')
          TI.EndTask()
!         AddRTBtask(UI, '', 0.1, 0)
          return
      
--- 32,39 ----
  
      # if low on fuel or out of ammo, rtb
!     if ((UI.GetFuel() < 0.55) or (not UI.IsEquippedForTargetType(0x0020))):
          UI.DeleteTask('EngageAll')
          TI.EndTask()
!         AddRTBtask(UI, '', 0.55, 0)
          return
      
***************
*** 55,59 ****
          intercept_target = 1
          UI.SetHeading(closest_bearing) # lag intercept
!         if (UI.GetFuel() > 0.5):
              UI.SetThrottle(1.1)
          else:
--- 55,59 ----
          intercept_target = 1
          UI.SetHeading(closest_bearing) # lag intercept
!         if (UI.GetFuel() > 0.7):
              UI.SetThrottle(1.1)
          else:
***************
*** 67,72 ****
  
      if (UI.IsAir()):
!         if (UI.GetAlt() < 6000):
!             UI.SetThrottle(1.1)
              UI.SetAlt(6000)
          else:
--- 67,72 ----
  
      if (UI.IsAir()):
!         if (UI.GetAlt() < 5500):
!             UI.SetThrottle(1.0)
              UI.SetAlt(6000)
          else:

Index: Landing.py
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/scripts/Landing.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Landing.py	20 Nov 2006 00:18:47 -0000	1.4
--- Landing.py	23 Nov 2006 00:08:15 -0000	1.5
***************
*** 59,62 ****
--- 59,63 ----
              UI.DisplayMessage('Landing %s' % base_name) 
          UI.SetAlt(1200 + alt_m)
+         UI.SetThrottle(0.7)
          TI.SetMemoryValue(2, 1)
          track_info.Offset(8, landing_data.Heading_rad + 3.1416)  # approach from rear for now
***************
*** 65,68 ****
--- 66,70 ----
          UI.SetAlt(400 + alt_m)
          UI.SetPitchLimit(15)
+         UI.SetThrottle(0.7)
          SetFractionalSpeed(UI,0.5)
      elif (land_state == 3):
***************
*** 70,73 ****
--- 72,76 ----
          UI.SetPitchLimit(10)
          SetFractionalSpeed(UI,0.4)
+         UI.SetThrottle(0.5)
          if(UI.GetLandingState()==0):
              UI.SetLandingState(1)   # gear down