summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Schedule.mdwn22
1 files changed, 7 insertions, 15 deletions
diff --git a/Schedule.mdwn b/Schedule.mdwn
index b0cca1a..a622369 100644
--- a/Schedule.mdwn
+++ b/Schedule.mdwn
@@ -1,23 +1,20 @@
-<iframe src="http://www.google.com/calendar/embed?src=rffo3qnbq7ucugqbh3701m2ifc%40group.calendar.google.com&ctz=America/Los_Angeles" style="border-width:0" width="800" frameborder="0" height="600"></iframe>
-
Upcoming Events
===============
-- **May 22-23, 2010: Cancelled** PSAS was scheduled to launch LV2c with roll control and some minimal avionics on an N2000W motor at Oregon Rocketry's [Spring Thunder](http://www.oregonrocketry.com/?page_id=54) rocket launch in Brothers, Oregon. This launch has been **scrubbed** due to weather. We will try to launch at the next window, which will be OROC's [Summer Skies](http://www.oregonrocketry.com/?page_id=54) event June 25–27.
-
-- **September 24-26th, 2010:** AHPRA's "BALLS 19" launch event in the Black Rock Desert of Nevada. PSAS is tentatively schedule to launch there.
+- **October 17th, 2010:** Preliminary launch date for LV2.3 + roll control in Brothers, Oregon. More details soon.
Team Meetings
=============
-- PSAS meetings are normally held every Tuesday at 7:00pm, either in [[FAB 155|FAB#155]], or in the "CS Lounge" which is right next to the CS Department. There is typically a meeting every week; email us if you want to attend some Tuesday but don't see a scheduled meeting for that day.
+- PSAS meetings are normally held every Tuesday at 7:00pm in the [[Fourth Avenue Building|FAB]] at PSU. We meet either in [[FAB 155 (the ECE conference room)|FAB#155]], or in the [["CS Lounge"|FAB#CSLOUNGE]] which is right next to the CS Department Office in the FAB. Although we try to be there at 7:00pm, sometimes we're late, so please hang around. Although there is typically a meeting every week, [[please do email us|contact]] if you're new just to make sure we're there.
+PSAS Google Calendar
+====================
-Misc.
-=====
+<iframe src="http://www.google.com/calendar/embed?src=rffo3qnbq7ucugqbh3701m2ifc%40group.calendar.google.com&ctz=America/Los_Angeles" style="border-width:0" width="800" frameborder="0" height="600"></iframe>
Directions
-----------
+==========
For our general and Avionics Team meetings, we usually meet in Room 155 of the Fourth Avenue building (1900 SW 4th Avenue) of [Portland State University](http://www.pdx.edu/) which is located in the southern end of Portland, Oregon. Other times, especially for workshops and fieldtrips, we'll meet at a team member's house.
@@ -30,13 +27,8 @@ For our general and Avionics Team meetings, we usually meet in Room 155 of the F
- the [[Central Oregon Brothers Launch Site|BrothersSite]]
- Directions to [[various other places|Minutiae/OtherDirections]].
-Long Term: PSAS Road Map
-------------------------
-
-Here's a very, very outdated and very long term (for us, anyway!) plan for PSAS: where we are and where we're going: [[PSAS Road Map|PsasRoadMap]]
-
Past Events and Meetings
-------------------------
+========================
- See the group [[History]].
- For team meeting notes, please see the [[Teams]] homepage.