altos/chaoskey-v1.0: Add endpoint for reading flash contents

[fw/altos] / src / drivers / ao_ms5607.c

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 6098699edf4b1735a8a0ede41fd163722ba809aa..914e0c1b3c7b620ca40c23ee82f88c9ac5b5576e 100644 (file)
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,9 +25,13 @@
 __xdata struct ao_ms5607_prom  ao_ms5607_prom;
 static __xdata uint8_t         ms5607_configured;
 
+#ifndef AO_MS5607_SPI_SPEED
+#define AO_MS5607_SPI_SPEED    AO_SPI_SPEED_FAST
+#endif
+
 static void
 ao_ms5607_start(void) {
-       ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX, AO_SPI_SPEED_FAST);
+       ao_spi_get_bit(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, AO_MS5607_CS, AO_MS5607_SPI_INDEX, AO_MS5607_SPI_SPEED);
 }
 
 static void
@@ -186,17 +191,23 @@ ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample)
 #include "ao_ms5607_convert.c"
 #endif
 
-#if HAS_TASK
+#ifndef HAS_MS5607_TASK
+#define HAS_MS5607_TASK HAS_TASK
+#endif
+
 __xdata struct ao_ms5607_sample        ao_ms5607_current;
 
+#if HAS_MS5607_TASK
 static void
 ao_ms5607(void)
 {
+       struct ao_ms5607_sample sample;
        ao_ms5607_setup();
        for (;;)
        {
-               ao_ms5607_sample(&ao_ms5607_current);
+               ao_ms5607_sample(&sample);
                ao_arch_block_interrupts();
+               ao_ms5607_current = sample;
                AO_DATA_PRESENT(AO_DATA_MS5607);
                AO_DATA_WAIT();
                ao_arch_release_interrupts();
@@ -204,7 +215,9 @@ ao_ms5607(void)
 }
 
 __xdata struct ao_task ao_ms5607_task;
+#endif
 
+#if HAS_TASK
 void
 ao_ms5607_info(void)
 {
@@ -243,6 +256,8 @@ ao_ms5607_init(void)
 
 #if HAS_TASK
        ao_cmd_register(&ao_ms5607_cmds[0]);
+#endif
+#if HAS_MS5607_TASK
        ao_add_task(&ao_ms5607_task, ao_ms5607, "ms5607");
 #endif