From: Bdale Garbee <bdale@gag.com>
Date: Mon, 29 Apr 2013 23:24:43 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
X-Git-Tag: 1.2.1~95
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7cce6c205e4595894e033ab8f0acc8064bf9f561;hp=75f8229d4a8d7c9a28ea3d88fda72af0d1f1ccc2

Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
---

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index 912a835c..b2ae407c 100644
--- a/altosdroid/Notebook
+++ b/altosdroid/Notebook
@@ -20,3 +20,7 @@ Desired AltosDroid feature list
  *) Frequency scanning
 
  *) Select satellite imaging mode
+
+ *) Remember most-recently-used TBT and frequency, perhaps
+    auto-connect at startup.
+    
diff --git a/src/Makefile b/src/Makefile
index e271ddf3..90a74166 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@ AVRDIRS=\
 	telescience-v0.1 telescience-pwm telepyro-v0.1 micropeak
 
 ARMDIRS=\
-	telemega-v0.1 megadongle-v0.1 stm-bringup stm-demo telelco-v0.1 \
+	telemega-v0.1 telemega-v0.3 megadongle-v0.1 stm-bringup stm-demo telelco-v0.1 \
 	telescience-v0.2
 
 ifneq ($(shell which sdcc),)
diff --git a/src/telemega-v0.3/ao_pins.h b/src/telemega-v0.3/ao_pins.h
index 578b1e4c..b1504d28 100644
--- a/src/telemega-v0.3/ao_pins.h
+++ b/src/telemega-v0.3/ao_pins.h
@@ -111,6 +111,7 @@
 #define HAS_GPS			1
 #define HAS_FLIGHT		1
 #define HAS_ADC			1
+#define HAS_ADC_TEMP		1
 #define HAS_LOG			1
 
 /*
diff --git a/src/telescience-v0.2/ao_pins.h b/src/telescience-v0.2/ao_pins.h
index 7b974506..03bd59db 100644
--- a/src/telescience-v0.2/ao_pins.h
+++ b/src/telescience-v0.2/ao_pins.h
@@ -108,6 +108,7 @@
 #define HAS_GPS			0
 #define HAS_FLIGHT		0
 #define HAS_ADC			1
+#define HAS_ADC_TEMP		1
 #define HAS_LOG			1
 
 /*