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

diff --git a/altosdroid/Notebook b/altosdroid/Notebook
index 912a835c114a3b97e9cda80a0777dc497afcba7c..b2ae407c79953488c8cf0ac2522174633c17623a 100644 (file)
--- 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 e271ddf3f3f9d9c4608e5664cd6fe5c1403c5c31..90a74166d8a15b62f88e3f118036c802598b4469 100644 (file)
--- 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 578b1e4c001e9e7529eea24be032e2d4af7ba611..b1504d28ddf0730d731d00e78a76f677766b2726 100644 (file)
--- 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 7b97450636e81f7cece8600e76c26c12eaa2ddc4..03bd59db230c35b411976b8cbe5c2e7460ccf54b 100644 (file)
--- 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
 
 /*