altos: Add support for multiple SPI busses and sharing device drivers

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

diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 970fea1e5fe9e0e53f48672e0ef80ac070f4bdcd..3c0a310dfdc1e5650edd7adf7eebde0a8c40912a 100644 (file)
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -18,11 +18,6 @@
 #include <ao.h>
 #include "ao_ms5607.h"
 
-#define AO_MS5607_CS_GPIO      stm_gpioc
-#define AO_MS5607_CS           4
-#define AO_MS5607_CS_MASK      (1 << AO_MS5607_CS)
-#define AO_MS5607_SPI_INDEX    (STM_SPI_INDEX(1))
-
 struct ms5607_prom {
        uint16_t        reserved;
        uint16_t        sens;
@@ -55,6 +50,7 @@ ao_ms5607_reset(void) {
        cmd = AO_MS5607_RESET;
        ao_ms5607_start();
        ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
+       ao_delay(AO_MS_TO_TICKS(10));
        ao_ms5607_stop();
 }
 
@@ -63,6 +59,7 @@ ao_ms5607_prom_read(uint8_t addr)
 {
        uint8_t cmd = AO_MS5607_PROM_READ(addr);
        uint8_t d[2];
+       uint16_t v;
 
        ao_ms5607_start();
        ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
@@ -75,11 +72,20 @@ static void
 ao_ms5607_init_chip(void) {
        uint8_t         addr;
        uint16_t        *prom;
+
        ao_ms5607_reset();
        prom = &ms5607_prom.reserved;
 
        for (addr = 0; addr <= 7; addr++)
                prom[addr] = ao_ms5607_prom_read(addr);
+       printf ("reserved: 0x%x\n", ms5607_prom.reserved);
+       printf ("sens:     0x%x\n", ms5607_prom.sens);
+       printf ("off:      0x%x\n", ms5607_prom.off);
+       printf ("tcs:      0x%x\n", ms5607_prom.tcs);
+       printf ("tco:      0x%x\n", ms5607_prom.tco);
+       printf ("tref:     0x%x\n", ms5607_prom.tref);
+       printf ("tempsens: 0x%x\n", ms5607_prom.tempsens);
+       printf ("crc:      0x%x\n", ms5607_prom.crc);
 }
 
 static uint32_t
@@ -91,7 +97,7 @@ ao_ms5607_convert(uint8_t cmd) {
        ao_spi_send(&cmd, 1, AO_MS5607_SPI_INDEX);
        ao_ms5607_stop();
 
-       ao_delay(AO_MS_TO_TICKS(200));
+       ao_delay(AO_MS_TO_TICKS(20));
 
        ao_ms5607_start();
        read = AO_MS5607_ADC_READ;
@@ -106,28 +112,19 @@ static void
 ao_ms5607_dump(void)
 {
        uint8_t addr;
-       uint32_t d1, d2;
+       uint32_t D1, D2;
        int32_t dT;
        int32_t TEMP;
        int64_t OFF;
        int64_t SENS;
        int32_t P;
 
-       ao_ms5607_init_chip();
-       printf ("reserved: %d\n", ms5607_prom.reserved);
-       printf ("sens:     %d\n", ms5607_prom.sens);
-       printf ("off:      %d\n", ms5607_prom.off);
-       printf ("tcs:      %d\n", ms5607_prom.tcs);
-       printf ("tco:      %d\n", ms5607_prom.tco);
-       printf ("tref:     %d\n", ms5607_prom.tref);
-       printf ("tempsens: %d\n", ms5607_prom.tempsens);
-       printf ("crc:      %d\n", ms5607_prom.crc);
-       d1 =  ao_ms5607_convert(AO_MS5607_CONVERT_D1_4096);
-       printf ("Conversion D1: %d\n", d1);
-       d2 =  ao_ms5607_convert(AO_MS5607_CONVERT_D2_4096);
-       printf ("Conversion D2: %d\n", d2);
-
-       dT = d2 - ((int32_t) ms5607_prom.tref << 8);
+       D2 =  ao_ms5607_convert(AO_MS5607_CONVERT_D2_4096);
+       printf ("Conversion D2: %d\n", D2);
+       D1 =  ao_ms5607_convert(AO_MS5607_CONVERT_D1_4096);
+       printf ("Conversion D1: %d\n", D1);
+
+       dT = D2 - ((int32_t) ms5607_prom.tref << 8);
        
        TEMP = 2000 + (((int64_t) dT * ms5607_prom.tempsens) >> 23);
 
@@ -142,13 +139,14 @@ ao_ms5607_dump(void)
                int64_t SENS2 = 2 * (int64_t) TEMPM * (int64_t) TEMPM;
        }
 
-       P = ((((int64_t) d1 * SENS) >> 21) - OFF) >> 15;
+       P = ((((int64_t) D1 * SENS) >> 21) - OFF) >> 15;
        
-       printf ("Temperature: %d", TEMP);
+       printf ("Temperature: %d\n", TEMP);
        printf ("Pressure %d\n", P);
 }
 
 __code struct ao_cmds ao_ms5607_cmds[] = {
+       { ao_ms5607_init_chip,  "i\0Init MS5607" },
        { ao_ms5607_dump,       "p\0Display MS5607 data" },
        { 0, NULL },
 };
@@ -157,8 +155,5 @@ void
 ao_ms5607_init(void)
 {
        ao_cmd_register(&ao_ms5607_cmds[0]);
-
-       stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN);
-       stm_gpio_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, 1);
-       stm_moder_set(&AO_MS5607_CS_GPIO, AO_MS5607_CS, STM_MODER_OUTPUT);
+       ao_spi_init_cs(AO_MS5607_CS_GPIO, (1 << AO_MS5607_CS));
 }