Merge branch 'master' into telescience-v0.2
authorKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 23:22:46 +0000 (15:22 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 16 Jan 2013 23:22:46 +0000 (15:22 -0800)
1  2 
src/Makefile

diff --combined src/Makefile
index a17f51ac8846623bc218eca63b05c89a68af3ce7,67ad97d1b7e54500ad153b467f73723b4fc6357b..e4b110390c2cb5b6e4221136d3dc8ac60da23654
@@@ -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