From: Bdale Garbee Date: Fri, 1 Mar 2013 20:58:57 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b0a63221372977ac85322a5b0ed6bef702404788;hp=04d31a4b6e18a32a49467ed2c40ff19a6bc82b2a;p=web%2Faltusmetrum Merge branch 'master' of ssh://git.gag.com/scm/git/web/altusmetrum --- diff --git a/MicroPeak/index.mdwn b/MicroPeak/index.mdwn index 5938b00..d74e293 100644 --- a/MicroPeak/index.mdwn +++ b/MicroPeak/index.mdwn @@ -32,11 +32,11 @@ running Mac OS X or Windows, a compatible version of those drivers is included with the software. You can also install a different from from the [FTDI Driver](http://www.ftdichip.com/FTDrivers.htm) page. -### Latest version ### +### Latest version (1.2) ### - * [Windows](releases/1.2/MicroPeak-Windows-1-1-9-3.exe) - * [Linux](releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2) - * [Mac OS X](releases/1.2/MicroPeak-Mac-1.1.9.3.dmg) + * [Windows](releases/1.2/MicroPeak-Windows-1-2.exe) + * [Linux](releases/1.2/MicroPeak-Linux-1.2.tar.bz2) + * [Mac OS X](releases/1.2/MicroPeak-Mac-1.2.dmg) ## Hardware Features ## diff --git a/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2 b/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2 deleted file mode 100644 index ff6c0f4..0000000 Binary files a/MicroPeak/releases/1.2/MicroPeak-Linux-1.1.9.3.tar.bz2 and /dev/null differ diff --git a/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2 b/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2 new file mode 100644 index 0000000..7c709fa Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Linux-1.2.tar.bz2 differ diff --git a/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg b/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg deleted file mode 100644 index 5f206dc..0000000 Binary files a/MicroPeak/releases/1.2/MicroPeak-Mac-1.1.9.3.dmg and /dev/null differ diff --git a/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg b/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg new file mode 100644 index 0000000..30aa445 Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Mac-1.2.dmg differ diff --git a/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe b/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe deleted file mode 100644 index aa1c974..0000000 Binary files a/MicroPeak/releases/1.2/MicroPeak-Windows-1-1-9-3.exe and /dev/null differ diff --git a/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe b/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe new file mode 100644 index 0000000..0bdcb9d Binary files /dev/null and b/MicroPeak/releases/1.2/MicroPeak-Windows-1-2.exe differ diff --git a/MicroPeakUSB/index.mdwn b/MicroPeakUSB/index.mdwn index 0165144..959e4d7 100644 --- a/MicroPeakUSB/index.mdwn +++ b/MicroPeakUSB/index.mdwn @@ -7,7 +7,7 @@ The MicroPeak USB Interface board provides a way to capture [MicroPeak](../MicroPeak/) flight logs over a USB connection to a computer running Linux, Mac OS or Windows. - + ## MicroPeak Data ## @@ -30,6 +30,8 @@ op-amp and serial-to-USB interface chip. It also includes a blue LED which blinks in time with the [MicroPeak](../MicroPeak/) orange LED. This makes aligning the two boards by hand quite easy. + + ## MicroPeak Application ## The MicroPeak application written in Java runs on diff --git a/MicroPeakUSB/v1.0/mpbundle-640.jpg b/MicroPeakUSB/v1.0/mpbundle-640.jpg new file mode 100644 index 0000000..5d5cf3d Binary files /dev/null and b/MicroPeakUSB/v1.0/mpbundle-640.jpg differ diff --git a/MicroPeakUSB/v1.0/mpbundle.jpg b/MicroPeakUSB/v1.0/mpbundle.jpg new file mode 100644 index 0000000..167a17c Binary files /dev/null and b/MicroPeakUSB/v1.0/mpbundle.jpg differ diff --git a/MicroPeakUSB/v1.0/mpusb-dime-640.jpg b/MicroPeakUSB/v1.0/mpusb-dime-640.jpg new file mode 100644 index 0000000..c425f56 Binary files /dev/null and b/MicroPeakUSB/v1.0/mpusb-dime-640.jpg differ diff --git a/MicroPeakUSB/v1.0/mpusb-dime.jpg b/MicroPeakUSB/v1.0/mpusb-dime.jpg new file mode 100644 index 0000000..7cfa4fc Binary files /dev/null and b/MicroPeakUSB/v1.0/mpusb-dime.jpg differ