#if AO_MS5607_PRIVATE_PINS
ao_spi_put(AO_MS5607_SPI_INDEX);
#endif
- cli();
+ ao_arch_block_interrupts();
while (!ao_ms5607_done)
ao_sleep((void *) &ao_ms5607_done);
- sei();
+ ao_arch_release_interrupts();
#if AO_MS5607_PRIVATE_PINS
stm_gpio_set(AO_MS5607_CS_PORT, AO_MS5607_CS_PIN, 1);
#else
return ((uint32_t) reply[0] << 16) | ((uint32_t) reply[1] << 8) | (uint32_t) reply[2];
}
-void
-ao_ms5607_sample(struct ao_ms5607_sample *sample)
-{
- sample->pres = ao_ms5607_get_sample(AO_MS5607_CONVERT_D1_2048);
- sample->temp = ao_ms5607_get_sample(AO_MS5607_CONVERT_D2_2048);
-}
+#ifndef AO_MS5607_BARO_OVERSAMPLE
+#define AO_MS5607_BARO_OVERSAMPLE 2048
+#endif
-void
-ao_ms5607_convert(struct ao_ms5607_sample *sample, struct ao_ms5607_value *value)
-{
- int32_t dT;
- int32_t TEMP;
- int64_t OFF;
- int64_t SENS;
-
- dT = sample->temp - ((int32_t) ms5607_prom.tref << 8);
-
- TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23);
-
-#if HAS_MS5611
- OFF = ((int64_t) ms5607_prom.off << 16) + (((int64_t) ms5607_prom.tco * dT) >> 7);
- SENS = ((int64_t) ms5607_prom.sens << 15) + (((int64_t) ms5607_prom.tcs * dT) >> 8);
-#else
- OFF = ((int64_t) ms5607_prom.off << 17) + (((int64_t) ms5607_prom.tco * dT) >> 6);
- SENS = ((int64_t) ms5607_prom.sens << 16) + (((int64_t) ms5607_prom.tcs * dT) >> 7);
+#ifndef AO_MS5607_TEMP_OVERSAMPLE
+#define AO_MS5607_TEMP_OVERSAMPLE AO_MS5607_BARO_OVERSAMPLE
#endif
- if (TEMP < 2000) {
- int32_t T2 = ((int64_t) dT * (int64_t) dT) >> 31;
- int32_t TEMPM = TEMP - 2000;
- int64_t OFF2 = (61 * (int64_t) TEMPM * (int64_t) TEMPM) >> 4;
- int64_t SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM;
- if (TEMP < 1500) {
- int32_t TEMPP = TEMP + 1500;
- int64_t TEMPP2 = TEMPP * TEMPP;
- OFF2 = OFF2 + 15 * TEMPP2;
- SENS2 = SENS2 + 8 * TEMPP2;
- }
- TEMP -= T2;
- OFF -= OFF2;
- SENS -= SENS2;
- }
+#define token_paster(x,y) x ## y
+#define token_evaluator(x,y) token_paster(x,y)
+
+#define AO_CONVERT_D1 token_evaluator(AO_MS5607_CONVERT_D1_, AO_MS5607_BARO_OVERSAMPLE)
+#define AO_CONVERT_D2 token_evaluator(AO_MS5607_CONVERT_D2_, AO_MS5607_TEMP_OVERSAMPLE)
- value->pres = ((((int64_t) sample->pres * SENS) >> 21) - OFF) >> 15;
- value->temp = TEMP;
+void
+ao_ms5607_sample(struct ao_ms5607_sample *sample)
+{
+ sample->pres = ao_ms5607_get_sample(AO_CONVERT_D1);
+ sample->temp = ao_ms5607_get_sample(AO_CONVERT_D2);
}
+#include "ao_ms5607_convert.c"
+
#if HAS_TASK
+struct ao_ms5607_sample ao_ms5607_current;
+
static void
ao_ms5607(void)
{
ao_ms5607_setup();
for (;;)
{
- ao_ms5607_sample((struct ao_ms5607_sample *) &ao_data_ring[ao_data_head].ms5607_raw);
+ ao_ms5607_sample(&ao_ms5607_current);
ao_arch_critical(
AO_DATA_PRESENT(AO_DATA_MS5607);
AO_DATA_WAIT();
static void
ao_ms5607_dump(void)
{
- struct ao_ms5607_sample sample;
struct ao_ms5607_value value;
- ao_ms5607_setup();
- ao_ms5607_sample(&sample);
- ao_ms5607_convert(&sample, &value);
- printf ("Pressure: %8u %8d\n", sample.pres, value.pres);
- printf ("Temperature: %8u %8d\n", sample.temp, value.temp);
+ ao_ms5607_convert(&ao_ms5607_current, &value);
+ printf ("Pressure: %8u %8d\n", ao_ms5607_current.pres, value.pres);
+ printf ("Temperature: %8u %8d\n", ao_ms5607_current.temp, value.temp);
printf ("Altitude: %ld\n", ao_pa_to_altitude(value.pres));
}