Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / drivers / ao_mmc5983.h

diff --git a/src/drivers/ao_mmc5983.h b/src/drivers/ao_mmc5983.h
index 5700c4cd248eeb18235bd4ab91beec6fd3a5504f..103d595f7586c8c9d5bf25f82d6065f545432251 100644 (file)
--- a/src/drivers/ao_mmc5983.h
+++ b/src/drivers/ao_mmc5983.h
@@ -21,6 +21,8 @@
 
 #define MMC5983_READ           0x80
 
+#define MMC5983_I2C_ADDR       0x60
+
 #define MMC5983_CONFIG_A       0
 
 #define  MMC5983_CONFIG_A_MA           5
@@ -124,7 +126,9 @@
 #define  MMC5983_CONTROL_3_ST_ENP              1
 
 #define MMC5983_PRODUCT_ID     0x2f
-#define MMC5983_PRODUCT_ID_PRODUCT     0x30
+#define MMC5983_PRODUCT_ID_PRODUCT_I2C 0x30
+#define MMC5983_PRODUCT_ID_PRODUCT_SPI 0x31
+
 
 struct ao_mmc5983_sample {
        int16_t         x, y, z;
@@ -138,7 +142,6 @@ struct ao_mmc5983_raw {
        uint8_t         y1;
        uint8_t         z0;
        uint8_t         z1;
-       uint8_t         xyz2;
 };
 
 extern struct ao_mmc5983_sample        ao_mmc5983_current;