diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-03 10:43:28 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-03 10:43:28 -0700 |
| commit | 2cac8c572ce533ded89dae9a412b4d1b5c748342 (patch) | |
| tree | 6f7d7880f7b32d6bf60c422b2a11f4b8e21e4ecd | |
| parent | fdd08cc093134c5f87dab9533b99a042a699381b (diff) | |
altos: Re-enable the ms5607 and mma655x acquisition threads
These were disabled to help with testing in Argonia
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | src/drivers/ao_mma655x.c | 4 | ||||
| -rw-r--r-- | src/drivers/ao_ms5607.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c index 06422206..005bc684 100644 --- a/src/drivers/ao_mma655x.c +++ b/src/drivers/ao_mma655x.c @@ -20,7 +20,7 @@ #if HAS_MMA655X -#if 1 +#if 0 #define PRINTD(...) do { printf ("\r%5u %s: ", ao_tick_count, __func__); printf(__VA_ARGS__); } while(0) #else #define PRINTD(...) @@ -273,7 +273,7 @@ ao_mma655x_init(void) ao_cmd_register(&ao_mma655x_cmds[0]); ao_spi_init_cs(AO_MMA655X_CS_PORT, (1 << AO_MMA655X_CS_PIN)); -// ao_add_task(&ao_mma655x_task, ao_mma655x, "mma655x"); + ao_add_task(&ao_mma655x_task, ao_mma655x, "mma655x"); } #endif diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c index b0d5ddd4..76931b4b 100644 --- a/src/drivers/ao_ms5607.c +++ b/src/drivers/ao_ms5607.c @@ -19,7 +19,7 @@ #include <ao_exti.h> #include "ao_ms5607.h" -#if HAS_MS5607 +#if HAS_MS5607 || HAS_MS5611 static struct ao_ms5607_prom ms5607_prom; static uint8_t ms5607_configured; @@ -92,7 +92,7 @@ ao_ms5607_prom_read(struct ao_ms5607_prom *prom) printf ("MS5607 PROM CRC error (computed %x actual %x)\n", crc, (((uint8_t *) prom)[15] & 0xf)); flush(); -// ao_panic(AO_PANIC_SELF_TEST_MS5607); + ao_panic(AO_PANIC_SELF_TEST_MS5607); } #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -262,7 +262,7 @@ ao_ms5607_init(void) ao_cmd_register(&ao_ms5607_cmds[0]); ao_spi_init_cs(AO_MS5607_CS_PORT, (1 << AO_MS5607_CS_PIN)); -// ao_add_task(&ao_ms5607_task, ao_ms5607, "ms5607"); + ao_add_task(&ao_ms5607_task, ao_ms5607, "ms5607"); /* Configure the MISO pin as an interrupt; when the * conversion is complete, the MS5607 will raise this |