summaryrefslogtreecommitdiff
authorbenkay <benkay@web>2011-01-14 22:19:55 (GMT)
committer Portland State Aerospace Society <psas@psas.svcs.cs.pdx.edu>2011-01-14 22:19:55 (GMT)
commitc06c99956ba428f2b116f44aa26252aa73150aa8 (patch) (side-by-side diff)
treecaca993f09ffa7cb2a96a002238df4e9ac502941
parent2c8655d5f5853d9d931c3fd9874e5bead37415c2 (diff)
downloadwiki-c06c99956ba428f2b116f44aa26252aa73150aa8.zip
wiki-c06c99956ba428f2b116f44aa26252aa73150aa8.tar.gz
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--PropulsionTeamHome.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/PropulsionTeamHome.mdwn b/PropulsionTeamHome.mdwn
index 40d6038..a1bf862 100644
--- a/PropulsionTeamHome.mdwn
+++ b/PropulsionTeamHome.mdwn
@@ -3,8 +3,11 @@
----
**What We're Working On:** Currently we are developing hybrid motor technologies that will allow for a throttleable motor and also one capable of thrust vector control.
+
[[2012 Liquid Motor Notes]]
+[[Staging]]
+
**Update:** Sadly, the hybrid motor developers *seem* as if they are no longer interested in this technology (no progress since 2005). Now, a small number of PSAS folks are again interested in propulsion development, this time targeting experiments with liquid fuel.
<br />[[paraffinhybrid.jpg]]