summaryrefslogtreecommitdiff
path: root/src/megametrum-v0.1/ao_pins.h
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-18 16:49:28 -0700
committerKeith Packard <keithp@keithp.com>2012-10-18 16:49:28 -0700
commit7f664da148ae15d46d179d8ecede6fc0bc710ffb (patch)
treebd679edad131beb3fb00640ad7805b54c74ef289 /src/megametrum-v0.1/ao_pins.h
parent3aba5eb5a75dff3e7c8778561c533903eacb110a (diff)
parent23b0c2fe95dbfaa4a8ce603b56b75d12d2c17d8c (diff)
Merge branch 'master' into pwmin-new1.1.9.1pwmin-new
Diffstat (limited to 'src/megametrum-v0.1/ao_pins.h')
-rw-r--r--src/megametrum-v0.1/ao_pins.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/megametrum-v0.1/ao_pins.h b/src/megametrum-v0.1/ao_pins.h
index af8eebae..e4c8c8fb 100644
--- a/src/megametrum-v0.1/ao_pins.h
+++ b/src/megametrum-v0.1/ao_pins.h
@@ -105,8 +105,6 @@
#define HAS_GPS 1
#define HAS_FLIGHT 1
#define HAS_ADC 1
-#define HAS_ACCEL 1
-#define HAS_ACCEL_REF 1
#define HAS_LOG 1
/*
@@ -248,6 +246,7 @@ struct ao_adc {
* Pressure sensor settings
*/
#define HAS_MS5607 1
+#define HAS_MS5611 0
#define AO_MS5607_PRIVATE_PINS 1
#define AO_MS5607_CS_PORT (&stm_gpioc)
#define AO_MS5607_CS_PIN 4