boot/aircraft.ks

@@ -4,6 +4,7 @@ parameter debug is false.
 
 Bootstrap(
 "/boot/aircraft",
-List("/prog/aircraft"),
+"/prog/aircraft",
+List(), // no additional program files
 debug
 ).

boot/helicopter.ks

@@ -4,6 +4,7 @@ parameter debug is false.
 
 Bootstrap(
 "/boot/helicopter",
-List("/prog/helicopter"),
+"/prog/helicopter",
+List(), // no additional program files
 debug
 ).

boot/launchpad.ks

@@ -4,6 +4,7 @@ parameter debug is false.
 
 Bootstrap(
   "/boot/launchpad",
-  List("/prog/launchpad"),
+  "/prog/launchpad",
+  List(),
   debug
 ).

boot/rocket.ks

@@ -4,6 +4,7 @@ parameter debug is false.
 
 Bootstrap(
   "/boot/rocket",
-  List("/prog/rocket"),
+  "/prog/rocket",
+  List(),
   debug
 ).

boot/satellite.ks

@@ -4,12 +4,12 @@ parameter debug is false.
 
 Bootstrap(
   "/boot/satellite",
+  "",
   List(
     "/prog/execnode",
     "/prog/circ",
     "/prog/satdeploy",
     "/prog/nodestats"
   ),
-  debug,
-  false
+  debug
 ).

boot/science.ks

@@ -4,12 +4,12 @@ parameter debug is false.
 
 Bootstrap(
   "/boot/science",
+  "",
   List(
     "/prog/circ",
     "/prog/execnode",
     "/prog/nodestats",
     "/prog/reentry"
   ),
-  debug,
-  false
+  debug
 ).

lib/boot.ks

@@ -1,24 +1,20 @@
 
-// "bootfile" should be the path to the bootfile, so it can be deleted.
-// "programs" is a List() of programs to install in the CPU root.
-// "debug" will skip compiling if enabled, and only copy files.
-// if "init" is true, the first program in the programs List will become the new boot file.
-//   pass false in here if you want CPU control from the terminal.
 function Bootstrap {
-  parameter bootFile, programs, debug, init is true.
-
-  local initProgram is "".
-  if init {
-    set initProgram to programs[0]:Replace("/prog", "").
-  }
+  parameter bootFile, init, programs, debug.
 
   // create a list of libraries that we need to compile
   local libs is UniqueSet().
+  if init <> "" {
+    addLibs(libs, init).
+  }
   for program in programs {
     addLibs(libs, program).
   }
 
   // compile the main program files
+  if init <> "" {
+    compileFile(init, "/init", debug).
+  }
   for program in programs {
     compileFile(program, program:Replace("/prog", ""), debug).
   }
@@ -33,13 +29,18 @@ function Bootstrap {
     // Open a terminal and run init.
     CORE:PART:GETMODULE("kOSProcessor"):DOEVENT("Open Terminal").
     if init <> "" {
-      RunPath(initProgram).
+      run "/init".
     }
-  // ... or delete the bootstrapping file, configure to boot from the init program,
+  // ... or delete the bootstrapping file, set init to the bootfile,
   // and reboot.
   } else {
     DeletePath("1:" + bootfile).
-    set CORE:BOOTFILENAME to initProgram.
+    // Set OS to boot and restart.
+    if init = "" {
+      set CORE:BOOTFILENAME to "".
+    } else {
+      set CORE:BOOTFILENAME to "/init".
+    }
     reboot.
   }
 }

lib/launch_rocket.ks

@@ -30,12 +30,14 @@ function pitchProgram {
 function Launch {
   parameter apoapsisTarget is 80000.
   parameter atmoTWR is 2.0.
+  // parameter leadAngle is 2.
   parameter minPitch is 5.
-  parameter kickAngle is 20.
-  parameter kickTime is 30.
-  parameter kickStart is 100.
+  parameter initialPitch is 20.
+  parameter pitchTime is 30.
   parameter autoStage is true.
 
+  NoFuelResources(true).
+
   // Configure subsystems.
   RCS off.
   SAS off.
@@ -70,18 +72,17 @@ function Launch {
     }
   }
 
+  
   print "Phase 1: Vertical Ascent.".
   lock THROTTLE to 1.0.
   lock STEERING to Heading(90,90,270).
-  NoFuelResources(true).
-  PreLaunchCrossfeed(false).
   stage.
-  wait until SHIP:VERTICALSPEED > kickStart.
+  wait until SHIP:VERTICALSPEED > 100.
   
   print "Phase 2: Initial Pitch.".
   local startTime is TIME:SECONDS.
-  lock STEERING to pitchProgram(kickAngle, kickTime, startTime).
-  wait kickTime.
+  lock STEERING to pitchProgram(initialPitch, pitchTime, startTime).
+  wait pitchTime.
 
   print "Phase 3: Stable Prograde Boost.".
   lock STEERING to getClampedDir(minPitch).

lib/systems.ks

@@ -33,20 +33,3 @@ function NoFuelResources {
     }
   }
 }
-
-function PreLaunchCrossfeed {
-  parameter enable is true.
-
-  local eventName is "Disable Crossfeed".
-  if enable {
-    set eventName to "Enable Crossfeed".
-  }
-  
-  for part in SHIP:PartsTagged("prelaunch") {
-    if part:MODULES:Find("ModuleToggleCrossfeed") = -1 {
-      print "Prelaunch part does not have crossfeed module. skipping.".
-    } else if part:GetModule("ModuleToggleCrossfeed"):ALLEVENTNAMES:Find(eventName) > -1 {
-      part:GetModule("ModuleToggleCrossfeed"):DoEvent(eventName).
-    }
-  }
-}

prog/launchpad.ks

@@ -3,14 +3,11 @@
 // stages, spools up the engines, and then "releases control"
 // to the main ship computer.
 //
-// *** TAGGING REQUIREMENTS ***
 // The launchpad object should have the "launchpad" tag.
 // The ship's main CPU (the one with launch functionality" should be tagged "shipcpu".
-// Fuel tanks with the "nofuel" tag will have *all* resources temporarily disabled during the pre-launch
-// sequence. The main ship computer must re-enable them after staging. NoFuelResources() in lib/systems is ideal
+// Fuel tanks with the "nofuel" tag will have *all* resources temporarily disabled during this
+// sequence. The main ship computer must re-enable them after staging. NoFuelResources in lib/systems is ideal
 // for this.
-// Similarly, any crossfeed-capable decouplers tagged "prelaunch" will have crossfeed ENABLED during pre-launch.
-// MainCPU should, again, disable these once it stages. PreLaunchCrossfeed() in lib/systems is your friend.
 
 RunOncePath("/lib/systems").
 RunOncePath("/lib/ui").
@@ -38,7 +35,6 @@ function preLaunch {
 
   print "Beginning pre-launch sequence.".
   NoFuelResources(false).
-  PreLaunchCrossfeed(true).
 
   // turn on generator and fuel flow
   enableLaunchpadFlow().
@@ -60,8 +56,7 @@ function preLaunch {
   local msg is Lex(
     "command", "launch",
     "angle", options["Kick Angle"]:TEXT:ToNumber(),
-    "time", options["Kick Time"]:TEXT:ToNumber(),
-    "start", options["Kick Start"]:TEXT:ToNumber()
+    "time", options["Kick Time"]:TEXT:ToNumber()
     ).
   Processor("shipcpu"):CONNECTION:SendMessage(msg).
   iface:Hide().
@@ -81,8 +76,7 @@ MakeMenu(
   List(
     List("Spool-up Time", "SCALAR", "15"),
     List("Kick Angle", "SCALAR", "30"),
-    List("Kick Time", "SCALAR", "45"),
-    List("Kick Start", "SCALAR", "100")
+    List("Kick Time", "SCALAR", "45")
   ),
   "Execute",
   preLaunch@

prog/rocket.ks

@@ -20,9 +20,9 @@ on AG9 {
 // Top-level menu structure.
 local iface is gui(250, 300).
 set iface:X to 200.
-set iface:Y to 750.
+set iface:Y to 700.
 local top is iface:AddVLayout().
-local rows is list(MakeRow(top), MakeRow(top), MakeRow(top), MakeRow(top)).
+local rows is list(MakeRow(top), MakeRow(top), MakeRow(top)).
 local stk is iface:AddStack().
 
 // Buttons and menus.
@@ -95,9 +95,8 @@ MakeMenu(
   MakeButton(rows[2], "Launch"),
   List(
     List("Target Apoapsis", "SCALAR", "80000"),
-    List("Kick Angle", "SCALAR", "30"),
-    List("Kick Time", "SCALAR", "45"),
-    List("Kick Start", "SCALAR", "100"),
+    List("Initial Pitch", "SCALAR", "30"),
+    List("Pitch Time", "SCALAR", "45"),
     List("Atmo TWR", "SCALAR", "2.0"),
     List("Minimum Pitch", "SCALAR", "5"),
     List("Autostage", "BOOL", true)
@@ -109,9 +108,8 @@ MakeMenu(
       options["Target Apoapsis"]:TEXT:ToNumber(),
       options["Atmo TWR"]:TEXT:ToNumber(),
       options["Minimum Pitch"]:TEXT:ToNumber(),
-      options["Kick Angle"]:TEXT:ToNumber(),
-      options["Kick Time"]:TEXT:ToNumber(),
-      options["Kick Start"]:TEXT:ToNumber(),
+      options["Initial Pitch"]:TEXT:ToNumber(),
+      options["Pitch Time"]:TEXT:ToNumber(),
       options["Autostage"]:PRESSED
     ).
   }
@@ -173,50 +171,6 @@ MakeMenu(
   }
 ).
 
-MakeButton(
-  rows[3],
-  "Pro",
-  {
-    set done to false.
-    lock STEERING to SHIP:PROGRADE.
-    wait until done.
-    set done to false.
-  }
-).
-
-MakeButton(
-  rows[3],
-  "Ret",
-  {
-    set done to false.
-    lock STEERING to SHIP:RETROGRADE.
-    wait until done.
-    set done to false.
-  }
-).
-
-MakeButton(
-  rows[3],
-  "Srf Pro",
-  {
-    set done to false.
-    lock STEERING to SHIP:SRFPROGRADE.
-    wait until done.
-    set done to false.
-  }
-).
-
-MakeButton(
-  rows[3],
-  "Srf Ret",
-  {
-    set done to false.
-    lock STEERING to SHIP:SRFRETROGRADE.
-    wait until done.
-    set done to false.
-  }
-).
-
 iface:show().
 
 until SHIP:STATUS <> "PRELAUNCH" {
@@ -230,7 +184,6 @@ until SHIP:STATUS <> "PRELAUNCH" {
         5.0,
         data["angle"],
         data["time"],
-        data["start"],
         true
       ).
     }