X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fdrivers%2Fao_ms5607.h;h=18f99bf8928867c0d7802667fa3ba4fa1c0cfd1a;hp=29df25e47066875500dc8767282cffed4414eec1;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=1541fc0bde71f503b1ae5757497e9e1e6d023111

diff --git a/src/drivers/ao_ms5607.h b/src/drivers/ao_ms5607.h
index 29df25e4..18f99bf8 100644
--- 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
- * 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
@@ -35,7 +36,7 @@
 #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;
@@ -47,14 +48,32 @@ struct ms5607_prom {
 };
 
 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 __xdata struct ao_ms5607_sample	ao_ms5607_current;
+extern __xdata struct ao_ms5607_prom	ao_ms5607_prom;
+
+void
+ao_ms5607_setup(void);
+
 void
 ao_ms5607_init(void);
 
 void
-ao_ms5607_sample(struct ao_ms5607_sample *sample);
+ao_ms5607_info(void);
+
+void
+ao_ms5607_sample(__xdata struct ao_ms5607_sample *sample);
+
+void
+ao_ms5607_convert(__xdata struct ao_ms5607_sample *sample,
+		  __xdata struct ao_ms5607_value *value);
 
 #endif /* _AO_MS5607_H_ */