summaryrefslogtreecommitdiff
path: root/PropulsionTeamHome.mdwn
authorAnonymous <Anonymous>2004-05-12 17:57:00 (GMT)
committer Anonymous <Anonymous>2004-05-12 17:57:00 (GMT)
commitf1bedd5076baa98ecd7893ba68df6b03ddda8751 (patch) (side-by-side diff)
tree599b8f6baa683473301868e35b5f953559f65b23 /PropulsionTeamHome.mdwn
parent121a75763a9857a1f2f39833a0eede95512a584d (diff)
downloadwiki-f1bedd5076baa98ecd7893ba68df6b03ddda8751.zip
wiki-f1bedd5076baa98ecd7893ba68df6b03ddda8751.tar.gz
PropulsionTeamHome
Diffstat (limited to 'PropulsionTeamHome.mdwn') (more/less context) (ignore whitespace changes)
-rw-r--r--PropulsionTeamHome.mdwn20
1 files changed, 12 insertions, 8 deletions
diff --git a/PropulsionTeamHome.mdwn b/PropulsionTeamHome.mdwn
index 9d711e8..4cfc8d5 100644
--- a/PropulsionTeamHome.mdwn
+++ b/PropulsionTeamHome.mdwn
@@ -2,21 +2,15 @@
----
-**What We're Working On:** Presently the team is securing solid fuel rocket motors with a specific impulse of O and P. Concurrently we are developing hybrid motor technologies that will allow for a throttleable motor and also one capable of thrust vector control.
+**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.
<br />[[paraffinhybrid.jpg]]
-**Meetings:** The hybrid team meets on a bi-weekly basis.
-
-## <a name="LOX/Paraffin Hybrid Project Info"></a> LOX/Paraffin Hybrid Project Information:
-
-**PSAS Hybrid Team:** [[HybridTeamRoster]]<br />**Hybrid Team Mailing list:** [psas-propulsion](http://lists.psas.pdx.edu/mailman/listinfo/psas-propulsion)<br />**Upcoming Meetings:** [[Schedule]]<br /><br />
-
## <a name="Current News"></a> Current News
<font> </font>
-#### Second GOX/Paraffin static test January 31st, 2004 [(details)](http://twiki.psas.pdx.edu/bin/view/PSAS/TestFire31Jan04)
+#### Sensoring of static test fire stand underway.
#### <font> </font>
@@ -25,6 +19,12 @@
- [[Lab Scale GOX/Paraffin Hybrid Motor|LabScaleGOX/ParaffinHybridMotor]]
- [[Flight Article LOX/Paraffin Hybrid Motor|FlightArticleLOX/ParaffinHybridMotor]]
+## <a name="Hybrid Project Information:"></a> Hybrid Project Information:
+
+**Meetings:** The hybrid team meets on a bi-weekly basis.
+
+**PSAS Hybrid Team:** [[HybridTeamRoster]]<br />**Hybrid Team Mailing list:** [psas-propulsion](http://lists.psas.pdx.edu/mailman/listinfo/psas-propulsion)<br />**Upcoming Meetings:** [[Schedule]]<br /><br />
+
## <a name="Hybrid Team Meeting Minutes:"></a> Hybrid Team Meeting Minutes:
<table border=1 cellpadding=0 cellspacing=0>
@@ -32,6 +32,10 @@
<th bgcolor="#99CCCC"><strong> 2004 </strong></th>
</tr>
<tr>
+ <td>[[MeetingNotes15May04]]</td>
+ <td> Meeting Agenda </td>
+ </tr>
+ <tr>
<td>[[MeetingNotes1May04]]</td>
<td> Meeting Minutes </td>
</tr>