projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Change MMC5893 driver to avoid interrupts
[fw/altos]
/
src
/
drivers
/
ao_ms5607.h
diff --git
a/src/drivers/ao_ms5607.h
b/src/drivers/ao_ms5607.h
index 29df25e47066875500dc8767282cffed4414eec1..322cc4684a292ddba5bf9e9cc667b1a38237f06a 100644
(file)
--- a/
src/drivers/ao_ms5607.h
+++ b/
src/drivers/ao_ms5607.h
@@
-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
*
* 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
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-35,7
+36,7
@@
#define AO_MS5607_ADC_READ 0x00
#define AO_MS5607_PROM_READ(ad) (0xA0 | ((ad) << 1))
#define AO_MS5607_ADC_READ 0x00
#define AO_MS5607_PROM_READ(ad) (0xA0 | ((ad) << 1))
-struct ms5607_prom {
+struct
ao_
ms5607_prom {
uint16_t reserved;
uint16_t sens;
uint16_t off;
uint16_t reserved;
uint16_t sens;
uint16_t off;
@@
-47,14
+48,32
@@
struct ms5607_prom {
};
struct ao_ms5607_sample {
};
struct ao_ms5607_sample {
- int32_t temp;
- int32_t pres;
+ uint32_t pres; /* raw 24 bit sensor */
+ uint32_t temp; /* raw 24 bit sensor */
};
};
+struct ao_ms5607_value {
+ int32_t pres; /* in Pa * 10 */
+ int32_t temp; /* in °C * 100 */
+};
+
+extern struct ao_ms5607_sample ao_ms5607_current;
+extern struct ao_ms5607_prom ao_ms5607_prom;
+
+void
+ao_ms5607_setup(void);
+
void
ao_ms5607_init(void);
void
ao_ms5607_init(void);
+void
+ao_ms5607_info(void);
+
void
ao_ms5607_sample(struct ao_ms5607_sample *sample);
void
ao_ms5607_sample(struct ao_ms5607_sample *sample);
+void
+ao_ms5607_convert(struct ao_ms5607_sample *sample,
+ struct ao_ms5607_value *value);
+
#endif /* _AO_MS5607_H_ */
#endif /* _AO_MS5607_H_ */