summaryrefslogtreecommitdiff
path: root/PropulsionTeamHome.mdwn
authorIanOsgood <IanOsgood@web>2011-01-26 04:30:39 (GMT)
committer Portland State Aerospace Society <psas@psas.svcs.cs.pdx.edu>2011-01-26 04:30:39 (GMT)
commit67390c8a14b5e3d055da408144746dffa236abb0 (patch) (side-by-side diff)
tree9f4345e05c56fa5602a4940076671f0b997c5768 /PropulsionTeamHome.mdwn
parentb6e1ecbfc25f198435b5a14c53b97b7ec4182c96 (diff)
downloadwiki-67390c8a14b5e3d055da408144746dffa236abb0.zip
wiki-67390c8a14b5e3d055da408144746dffa236abb0.tar.gz
move old hybrid info to bottom
Diffstat (limited to 'PropulsionTeamHome.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--PropulsionTeamHome.mdwn15
1 files changed, 10 insertions, 5 deletions
diff --git a/PropulsionTeamHome.mdwn b/PropulsionTeamHome.mdwn
index a1bf862..4d8ac40 100644
--- a/PropulsionTeamHome.mdwn
+++ b/PropulsionTeamHome.mdwn
@@ -1,18 +1,23 @@
-# <a name="Propulsion Team Collaborative We"></a> Propulsion Team Collaborative Webpage
+# Propulsion Team Collaborative Webpage
----
-**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.
+After a five year hiatus, a small number of PSAS folks are again interested in propulsion development, this time targeting experiments with liquid fuel.
+
+**What We're Working On:** Currently we are developing 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.
+- **Propulsion Team Mailing list:** [psas-propulsion](http://lists.psas.pdx.edu/mailman/listinfo/psas-propulsion)
+- **Upcoming Meetings:** [[Schedule]]
-<br />[[paraffinhybrid.jpg]]
+## Old History (paraffin hybrid engine) <!-- TODO: move to another page -->
-## <a name="Current News"></a> Current News
+After the crash in 2005, the hybrid team leader left the group. The hybrid prototype was mothballed, and there was no further interest in propulsion design until 2010.
+
+<br />[[paraffinhybrid.jpg]]
#### Working on design of LOX/Paraffin hybrid.<br /> Version 2 Gox/Paraffin hybrid nearly complete