#include <ao_exti.h>
#include "ao_ms5607.h"
+#if HAS_MS5607
+
static struct ao_ms5607_prom ms5607_prom;
static uint8_t ms5607_configured;
static void
ao_ms5607_start(void) {
- ao_spi_get(AO_MS5607_SPI_INDEX);
- stm_gpio_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, 0);
+ ao_spi_get(AO_MS5607_SPI_INDEX,AO_SPI_SPEED_FAST);
+ stm_gpio_set(AO_MS5607_CS_GPIO, AO_MS5607_CS, 0);
}
static void
ao_ms5607_stop(void) {
- stm_gpio_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
+ stm_gpio_set(AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
ao_spi_put(AO_MS5607_SPI_INDEX);
}
static void
ao_ms5607_isr(void)
{
+ ao_exti_disable(AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
ao_ms5607_done = 1;
ao_wakeup(&ao_ms5607_done);
}
ao_ms5607_start();
ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
- ao_exti_enable(&AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
+ ao_exti_enable(AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
+#if AO_MS5607_PRIVATE_PINS
+ ao_spi_put(AO_MS5607_SPI_INDEX);
+#endif
cli();
while (!ao_ms5607_done)
ao_sleep(&ao_ms5607_done);
sei();
- ao_exti_disable(&AO_MS5607_MISO_GPIO, AO_MS5607_MISO);
+#if AO_MS5607_PRIVATE_PINS
+ stm_gpio_set(AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
+#else
ao_ms5607_stop();
+#endif
ao_ms5607_start();
read = AO_MS5607_ADC_READ;
value->temp = TEMP;
}
-struct ao_ms5607_sample ao_ms5607_current;
-
static void
ao_ms5607(void)
{
ao_ms5607_setup();
for (;;)
{
- struct ao_ms5607_sample ao_ms5607_next;
- ao_ms5607_sample(&ao_ms5607_next);
+ ao_ms5607_sample((struct ao_ms5607_sample *) &ao_data_ring[ao_data_head].ms5607_raw);
ao_arch_critical(
- ao_ms5607_current = ao_ms5607_next;
+ AO_DATA_PRESENT(AO_DATA_MS5607);
+ AO_DATA_WAIT();
);
- ao_delay(0);
}
}
__xdata struct ao_task ao_ms5607_task;
-static void
-ao_ms5607_dump(void)
+void
+ao_ms5607_info(void)
{
- struct ao_ms5607_sample sample;
- struct ao_ms5607_value value;
-
printf ("ms5607 reserved: %u\n", ms5607_prom.reserved);
printf ("ms5607 sens: %u\n", ms5607_prom.sens);
printf ("ms5607 off: %u\n", ms5607_prom.off);
printf ("ms5607 tref: %u\n", ms5607_prom.tref);
printf ("ms5607 tempsens: %u\n", ms5607_prom.tempsens);
printf ("ms5607 crc: %u\n", ms5607_prom.crc);
+}
- sample = ao_ms5607_current;
- ao_ms5607_convert(&sample, &value);
- printf ("Pressure: %8u %8d\n", sample.pres, value.pres);
- printf ("Temperature: %8u %8d\n", sample.temp, value.temp);
+static void
+ao_ms5607_dump(void)
+{
+ struct ao_data sample;
+ struct ao_ms5607_value value;
+
+ ao_data_get(&sample);
+ ao_ms5607_convert(&sample.ms5607_raw, &value);
+ printf ("Pressure: %8u %8d\n", sample.ms5607_raw.pres, value.pres);
+ printf ("Temperature: %8u %8d\n", sample.ms5607_raw.temp, value.temp);
printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
}
__code struct ao_cmds ao_ms5607_cmds[] = {
- { ao_ms5607_dump, "p\0Display MS5607 data" },
+ { ao_ms5607_dump, "B\0Display MS5607 data" },
{ 0, NULL },
};
* conversion is complete, the MS5607 will raise this
* pin as a signal
*/
- ao_exti_setup(&AO_MS5607_MISO_GPIO,
+ ao_exti_setup(AO_MS5607_MISO_GPIO,
AO_MS5607_MISO,
AO_EXTI_MODE_RISING,
ao_ms5607_isr);
/* Reset the pin from INPUT to ALTERNATE so that SPI works
* This needs an abstraction at some point...
*/
- stm_moder_set(&AO_MS5607_MISO_GPIO,
+ stm_moder_set(AO_MS5607_MISO_GPIO,
AO_MS5607_MISO,
STM_MODER_ALTERNATE);
}
+
+#endif