re-entry tweaks

beegSana.ks

@@ -4,19 +4,25 @@ run "poweredLanding".
 
 declare function Reentry{
 	print "Re-entry.".
-	lock steering to heading(90, 60, 0).
+	lock steering to heading(90, 70, 0).
 	ag1 on.
+	wait until altitude < 20000.
 	rcs off.
 
-	wait until (groundSpeed < 500 and altitude < 11000).
+	wait until (groundSpeed < 500 and altitude < 10000).
 	print "Flipping.".
 	rcs on.
 	lock steering to srfRetrograde.
 }
-
+wait until (altitude > 70000 and periapsis > 70000) or (verticalSpeed < -100 and periapsis < 0).
 wait until (periapsis < 0 and throttle = 0).
 print "Prep for re-entry".
+print "Dont forget to Turn of MechJob Q Limit".
 sas off.
+rcs on.
+// set mj to addons:mj.
+// set asc to mj:ascent.
+// set asc:limitqaenabled to false.
 CORE:PART:GETMODULE("kOSProcessor"):DOEVENT("Open Terminal").
 lock steering to heading(90, 60, 0).
 wait until (altitude < 70000).

poweredLanding.ks

@@ -32,6 +32,8 @@ function TestSetup{
 
 declare function Landing{
 	parameter altitudeOffset is 0.0.
+	parameter maxLandingSpeed is -20.
+	
 	print "Starting Landing".
 	gear on.
 	set pad to location_constants:kerbin:launchpad:position.
@@ -71,7 +73,7 @@ declare function Landing{
 
 	until landed {
 		set landingThrottle to hoverPid:update(time:seconds, verticalSpeed).
-		set hoverPid:setpoint to Map(alt:radar + altitudeOffset, 0, 100, -0.5, -20).
+		set hoverPid:setpoint to Map(alt:radar + altitudeOffset, 0, 100, -0.5, maxLandingSpeed).
 		wait 0.001.
 	}
 	print "Landed".