remove dangling comma

[web/altusmetrum] / index.mdwn

diff --git a/index.mdwn b/index.mdwn
index 35a2748a759794196f2deca300c7a421510f7432..b5114923ea00d2dfb3c148d16f5262ed7196f725 100644 (file)
--- a/index.mdwn
+++ b/index.mdwn
@@ -7,73 +7,102 @@ for high powered model rocketry by
 [Bdale Garbee](http://gag.com/bdale) and 
 [Keith Packard](http://keithp.com/keithp).
 <p>
 [Bdale Garbee](http://gag.com/bdale) and 
 [Keith Packard](http://keithp.com/keithp).
 <p>

-All hardware designs on this site are licensed under the 
-[TAPR](http://www.tapr.org/)
-[Open Hardware License](http://www.tapr.org/ohl.html), 
-and all the software is under the 
-[GNU](http://www.gnu.org/)
-[General Public License, version 2](http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
-or compatible licenses.
+Bdale and Keith share a strong commitment to
+[Free Software](https://en.wikipedia.org/wiki/Free_software), and as long time
+contributors to the [Debian](https://www.debian.org/) project are fully
+committed to the 
+[Debian Social Contract](https://www.debian.org/social_contract).  In the
+context of what you find here, this translates into an absolute commitment 
+to respect user freedom:
+<ul>
+<li> all of our hardware designs are licensed under the 
+     [TAPR](http://www.tapr.org/) 
+     [Open Hardware License](http://www.tapr.org/ohl.html) 
+</li>
+<li> all of our software is under the [GNU](http://www.gnu.org/)
+     [General Public License](https://www.gnu.org/licenses/#GPL) or 
+     compatible licenses. 
+</li>
+<li> all of our design tools and the software we use to run our business
+     is also Free Software
+</li>
+</ul>

 <p>
 Bdale's online store has a form you can use to 
 <p>
 Bdale's online store has a form you can use to 

-[contact us](http://shop.gag.com/contacts/).
-# [Latest News](News) #
+[contact us](http://shop.gag.com/contact/).

 
 # Download the latest [AltOS](AltOS/) software version #
 
 
 # Download the latest [AltOS](AltOS/) software version #
 

-# Where to Buy #
+# [Latest News](News) #
+
+# Where to Buy the Hardware #

 
 Altus Metrum products are available directly from 
 [Bdale's web store](https://shop.gag.com), and from these distributors:
 
   * United States
 
 Altus Metrum products are available directly from 
 [Bdale's web store](https://shop.gag.com), and from these distributors:
 
   * United States

+    * [AMWPro-X](http://amwprox.com)

     * [Apogee Components](http://www.apogeerockets.com)
     * [Bay Area Rocketry](http://bayarearocketry.com)
     * [Chris' Rocket Supplies](http://csrocketry.com)
     * [Apogee Components](http://www.apogeerockets.com)
     * [Bay Area Rocketry](http://bayarearocketry.com)
     * [Chris' Rocket Supplies](http://csrocketry.com)

-  * Australia
-    * [Australian Rocketry](http://www.ausrocketry.com)
+    * [Mile High Rocketry](https://www.milehighrocketry.com)
+    * [RCS Rocket Motor Components](https://www.rocketmotorparts.com/Avionics/cat1577810_4805783.aspx)
+    * [Rocketarium](https://www.rocketarium.com)
+    * [Science Education Center](http://sciedcenter.com/)
+    * [Wildman Rocketry](https://wildmanrocketry.com/)
+  * Canada
+    * [Canadian Rocket Store](https://www.allrockets.ca)

   * Italy
     * [SierraFoxHobbies](http://www.sierrafoxhobbies.com)
   * Italy
     * [SierraFoxHobbies](http://www.sierrafoxhobbies.com)

-  * Netherlands
-    * [Rebel Space](http://rebelspace.eu)

   * New Zealand
   * New Zealand

-    * [Aerospace Education](http://www.rockets.co.nz)
+    * [Reliable Rocketry](https://sites.google.com/view/reliable-rocketry)

 
 # Products #
 
 These products are available for purchase:
 
 * [TeleMetrum](TeleMetrum/) 
 
 # Products #
 
 These products are available for purchase:
 
 * [TeleMetrum](TeleMetrum/) 

-is our flagship product, a dual-deploy rocketry altimeter with
-GPS and bidirectional RF telemetry link.
+was our original (and still our most popular!) product, a dual-deploy rocketry 
+altimeter with GPS and RF telemetry link.

 
 * [TeleMega](TeleMega/)
 is a high-end flight computer with 6 pyro channels, tilt limits, more and 
 
 * [TeleMega](TeleMega/)
 is a high-end flight computer with 6 pyro channels, tilt limits, more and 

-better sensors, GPS, and a high performance bidirectional RF telemetry link.
+better sensors, GPS, and RF telemetry link.
+
+* [TeleMini](TeleMini/)
+is our smallest dual-deploy rocketry altimeter with telemetry using only a 
+barometric pressure sensor
+
+* [EasyMega](EasyMega/)
+is a high-end flight computer with 6 pyro channels, tilt limits, etc.  The
+design is essentially identical to [TeleMega](TeleMega/), but without the 
+GPS receiver and radio telemetry link.
+
+* [EasyMini](EasyMini/)
+is a small, low-cost, dual-deploy rocketry altimeter using just a barometry
+pressure sensor.
+
+* [EasyMotor](EasyMotor/) 
+is an in-flight data logger for research motor characterization.
+
+* [EasyTimer](EasyTimer/) 
+is a timer-based 2-channel pyro controller with tilt limits

 
 * [TeleDongle](TeleDongle/) 
 
 * [TeleDongle](TeleDongle/) 

-is a simple RF interface for use in ground stations interacting with rockets
-using [TeleMetrum](TeleMetrum/).  It may also be useful as a generic RF
-interface for other microcontroller systems.  Note that we don't actually 
-sell TeleDongle by itself, it is included in our 
-[Starter Pack](http://shop.gag.com/ground-stations/starter-pack.html) offering.
+is a simple USB to RF interface for use in ground stations interacting with 
+rockets using any of our products with RF telemetry.

 
 * [TeleBT](TeleBT) is a variation on [TeleDongle](TeleDongle/) that adds
 [Bluetooth](http://www.bluetooth.com) as an alternative to USB.  Particularly
 
 * [TeleBT](TeleBT) is a variation on [TeleDongle](TeleDongle/) that adds
 [Bluetooth](http://www.bluetooth.com) as an alternative to USB.  Particularly

-useful with the [AltosDroid](http://www.altusmetrum.org/AltosDroid/) app for Android devices!
+useful with the [AltosDroid](http://www.altusmetrum.org/AltosDroid/) app for 
+Android devices, or the compatible iOS application available for sale from
+our friends at [Iron Sheep Productions](http://altosui.ironsheep.biz/).

 
 * [TeleGPS](TeleGPS/)
 
 * [TeleGPS](TeleGPS/)

-is a GPS tracker and logger using the uBlox Max 7Q GPS receiver for
-high dynamic performance and a combination digital/APRS transmitter.
+is a GPS tracker and logger.

 
 

-* [EasyMega](EasyMega/)
-is a high-end flight computer with 6 pyro channels, tilt limits, etc.  The
-design is identical to [TeleMega](TeleMega/), but without the GPS receiver 
-and radio telemetry link.
-
-* [EasyMini](EasyMini/)
-is a small dual-deploy rocketry altimeter using the MS5607 barometry
-pressure sensor.
+* [TeleLaunch](TeleLaunch/)
+is a wireless launch control system capable of operating up to 792 pads.

 
 * [LipoCharger](LipoCharger/) 
 is a standalone battery charger for the Lithium Polymer batteries used in
 
 * [LipoCharger](LipoCharger/) 
 is a standalone battery charger for the Lithium Polymer batteries used in


@@ -87,14 +116,6 @@ ideal altimeter for model rocket contests.
 provides an interface between [MicroPeak](MicroPeak/) and USB to
 download flight log data.
 
 provides an interface between [MicroPeak](MicroPeak/) and USB to
 download flight log data.
 

-* [ChaosKey](ChaosKey) is a USB-attached True Random Number Generator
-
-The following product is available in limited quantity from time to time:
-
-* [TeleMini](TeleMini/)
-is a smaller dual-deploy rocketry altimeter with telemetry using only a 
-barometric pressure sensor
-

 # Projects #
 
 These are projects we're working on that may become products someday:
 # Projects #
 
 These are projects we're working on that may become products someday:


@@ -103,12 +124,18 @@ These are projects we're working on that may become products someday:
 is the name of the firmware and related utilities that Keith maintains for
 the set of hardware projects here.
 
 is the name of the firmware and related utilities that Keith maintains for
 the set of hardware projects here.
 

+* [AltosDroid](AltosDroid/) 
+is the name of our Android app based on AltOS.
+
+* [ChaosKey](ChaosKey/)
+is a true hardware random number generator that connects over USB.
+

 * [OpenAlt](OpenAlt/)
 was Bdale's original project here, a dual-deploy rocketry altimeter.  One 
 prototype was built, but never flown.
 
 * [OpenAlt](OpenAlt/)
 was Bdale's original project here, a dual-deploy rocketry altimeter.  One 
 prototype was built, but never flown.
 

-* [TeleLaunch](TeleLaunch/)
-is a wireless launch control system capable of operating up to 400 pads.
+* [TeleStatic](TeleStatic/)
+is a wireless system for operating rocket motor test stands.

 
 * [TeleNano](TeleNano/)
 is a tiny rocketry altimeter with telemetry using only a barometric 
 
 * [TeleNano](TeleNano/)
 is a tiny rocketry altimeter with telemetry using only a barometric 


@@ -127,6 +154,7 @@ analog sensor input, and 5 general purpose I/O lines.
 [TeleMetrum](TeleMetrum/) and [TeleMini](TeleMini/).
 
 # [Documents](Documents) #
 [TeleMetrum](TeleMetrum/) and [TeleMini](TeleMini/).
 
 # [Documents](Documents) #

+# [Awards and Recognition](awards) #

 
 # Hobby Rocketry #
 
 
 # Hobby Rocketry #
 


@@ -164,12 +192,11 @@ learn a lot and see some great flights by showing up at a club launch.
 
 As we make progress, you can read about it in our [News](News) feed.  Feel
 free to subscribe to our 
 
 As we make progress, you can read about it in our [News](News) feed.  Feel
 free to subscribe to our 

-[mailing list](http://lists.gag.com/mailman/listinfo/altusmetrum).  We also 
-hang out on IRC channel #altusmetrum on irc.oftc.net if you have
+[mailing list](https://lists.gag.com/mailman3/postorius/lists/altusmetrum.lists.gag.com/).
+We also hang out on IRC channel #altusmetrum on irc.oftc.net if you have

 questions that aren't answered here.  You can also find us on 
 questions that aren't answered here.  You can also find us on 

-[Facebook](http://www.facebook.com/group.php?gid=341167482968)
-and on
-[Google+](https://plus.google.com/109995815990298399569).
+[Facebook](http://www.facebook.com/group.php?gid=341167482968), though note
+we don't check Facebook very often.

 
 Our main projects include radio links.  If you don't already have one, 
 getting an [Amateur Radio](./Radio) license would be a good thing to do!
 
 Our main projects include radio links.  If you don't already have one, 
 getting an [Amateur Radio](./Radio) license would be a good thing to do!