Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

diff --cc ChangeLog
index c93d031b28b61888156af3f42008b9c2b1fdfac6,1a16bd7fa3b86b1d224222617fa1e0f69045b344..4f9316a19c90d41dcb2127f3d932438fea280dc7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -124,11 -4063,106 +4063,107 @@@ Date:   Fri May 17 03:21:08 2013 -070
      
      Signed-off-by: Keith Packard <keithp@keithp.com>
  
- commit 7699a55aed3a9a7daeb4c6a5a9a280f43edf455f
- Author: Bdale Garbee <bdale@gag.com>
- Date:   Thu May 16 00:34:26 2013 -0600
+ commit 4ef0136c27e8f47a1eb38f9cbcd2c61288732d78
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Wed May 15 15:32:59 2013 -0700
+ 
+     altos: Generate unmodulated carrier for CC1120 test mode
+     
+     This sets the deviation to 0, enables the preamble and turns on the
+     transmitter. It will sit there happily sending a bare carrier forever
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 1931e028bebc3cd8df9392e30eb0e888d0799768
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 22:29:06 2013 -0700
+ 
+     altos: Move MS5607 info from 'v' to 'c s'
+     
+     Makes more sense there.
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 69b9f613ad36b8039f223ed30f8c75913916d82c
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 22:19:07 2013 -0700
+ 
+     altos: Remove some MMA655x debugging printfs
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 0571531066918fdefe9447f3b4192d0c6c477afa
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 10:48:24 2013 -0700
+ 
+     altos: Grab SPI mutex until MPU6000 I2C mode is disabled
+     
+     If other drivers use the SPI bus, the MPU6000 gets confused as its
+     sitting on the bus looking for I2C messages. Just grab the mutex
+     before the OS is running and hold onto it until the MPU6000 has been initialized.
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 9beacd77b3e8106e036e50a67312dfee414fbc51
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 09:01:49 2013 -0700
+ 
+     altos: Initialize MPU6000 CS pin for SPI mode
+     
+     Without this, we can't talk to the chip very well
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 6d553230903ddd0ec522c07be0df975b38ef23d3
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 09:56:16 2013 -0700
+ 
+     altos: Fix telemega v0.3 igniter order (drogue/main moved). Label ADC dump
+     
+     telemega moves the igniters around so that E/F are now drogue/main.
+     Add custom labels for ADC values to make parsing possible
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit a4e4eec827d61a05fda52ddb68b55f17b6028d5e
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 09:25:08 2013 -0700
+ 
+     altos: gps serial routines are called ao_gps_*, not ao_ublox_*
+     
+     This caused the u-blox driver to use serial port 1 instead of the
+     project-specified serial port.
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 461215eea72ff9d64748304e76b08da37ee3dfe9
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 09:21:54 2013 -0700
+ 
+     altos: Give u-blox 3 seconds after boot before we bug it
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit 5e9193f6375be27e5f7a0321fd34b6acfe81247f
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Tue May 14 09:12:29 2013 -0700
  
-     update ChangeLog for release
+     altos: Add 'g' command to ublox GPS code.
+     
+     Take the gps_dump function from ao_gps_skytraq.c and move it to a new
+     file so it can be shared with the u-blox driver. That affects every
+     skytraq and u-blox user as they need to include the new file.
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
+ 
+ commit cdad289a0803babecd30cbc0a95be99c5caadeb5
+ Author: Keith Packard <keithp@keithp.com>
+ Date:   Wed May 15 01:24:56 2013 -0700
+ 
+     altos: Add flash-loader for telescience-v0.2
+     
+     Signed-off-by: Keith Packard <keithp@keithp.com>
++>>>>>>> branch-1.3
  
  commit 116d8570766fbd3ef529111171935637a2e466af
  Author: Keith Packard <keithp@keithp.com>

diff --cc configure.ac
index fb095d5b38a92420ad531a47731c29a9ff623996,b92e06a9af6d5696b2864a077269379526bf0036..0b2960ce5fc0dd9a44481d4f21ac062b8d111399
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -18,7 -18,7 +18,11 @@@ dn
  dnl Process this file with autoconf to create configure.
  
  AC_PREREQ(2.57)
++<<<<<<< HEAD
 +AC_INIT([altos], 1.2.1)
++=======
+ AC_INIT([altos], 1.3)
++>>>>>>> branch-1.3
  AC_CONFIG_SRCDIR([src/core/ao.h])
  AM_INIT_AUTOMAKE([foreign dist-bzip2])
  AM_MAINTAINER_MODE

diff --cc debian/rules
Simple merge

diff --cc src/test/Makefile
index 76d50f167c476a221a6fc3b2f6dc05bbd4e94beb,686fde0c7404a063815f85814a15e1a5b7518ba7..7ae06a8033d8311e9b3cedcc836be871d66c5f15
--- 1/src/test/Makefile
--- 2/src/test/Makefile
+++ b/src/test/Makefile
@@@ -73,3 -74,12 +74,12 @@@ ao_fat_test: ao_fat_test.c ao_fat.c ao_
  
  ao_aes_test: ao_aes_test.c ao_aes.c ao_aes_tables.c
        cc $(CFLAGS) -o $@ ao_aes_test.c
 -      cc $(CFLAGS) -o $@ ao_quaternion_test.c -lm
+ 
+ ao_int64_test: ao_int64_test.c ao_int64.c ao_int64.h
+       cc $(CFLAGS) -o $@ ao_int64_test.c
+ 
+ ao_ms5607_convert_test: ao_ms5607_convert_test.c ao_ms5607_convert_8051.c ao_int64.c ao_int64.h
+       cc $(CFLAGS) -o $@ ao_ms5607_convert_test.c
+ 
+ ao_quaternion_test: ao_quaternion_test.c ao_quaternion.h
++      cc $(CFLAGS) -o $@ ao_quaternion_test.c -lm