From: Keith Packard <keithp@keithp.com>
Date: Wed, 16 Jan 2013 23:22:46 +0000 (-0800)
Subject: Merge branch 'master' into telescience-v0.2
X-Git-Tag: altosdroid_v1.2-1~105^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a04c4f7b07e97d568f8f6f56dd363329817fb52c;hp=-c

Merge branch 'master' into telescience-v0.2
---

a04c4f7b07e97d568f8f6f56dd363329817fb52c
diff --combined src/Makefile
index a17f51ac,67ad97d1..e4b11039
--- a/src/Makefile
+++ b/src/Makefile
@@@ -8,6 -8,7 +8,7 @@@ vpath make-kalman uti
  vpath make-whiten util
  vpath kalman.5c kalman
  vpath kalman_filter.5c kalman
+ vpath kalman_micro.5c kalman
  vpath load_csv.5c kalman
  vpath matrix.5c kalman
  
@@@ -22,7 -23,7 +23,7 @@@ SDCCDIRS=
  	telelaunch-v0.1 tidongle test \
  	teleterra-v0.2 teleshield-v0.1 \
  	telefire-v0.1 \
 -	spiradio-v0.1
 +	spiradio-v0.1 telescience-v0.2
  
  AVRDIRS=\
  	telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak