diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-27 00:38:53 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-27 00:38:53 -0700 |
| commit | c968b61f193b860fb7b4ef40718a95e1b87e978c (patch) | |
| tree | 97bf80e7aebc2f6d71aba2deaf58678e07925be3 | |
| parent | 2784fa14ba1803852ac46389451c97dff4992eb5 (diff) | |
| parent | 38a680e1407a80ff8ad19e1a90dd4e87b22fe922 (diff) | |
Merge branch 'master' into stm-flash
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/telemega-v0.3/ao_pins.h | 1 | ||||
| -rw-r--r-- | src/telescience-v0.2/ao_pins.h | 1 |
3 files changed, 3 insertions, 1 deletions
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 /* |