From: Keith Packard <keithp@keithp.com>
Date: Tue, 9 Oct 2012 06:24:19 +0000 (-0700)
Subject: altos: Fix up ms5607 and mma655x commands to work again
X-Git-Tag: 1.1.9.1^2~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0361235c9ef56738ba0e97be88a85afef0ce8268;hp=39c5738acdfdf0c87b64de6135fe107971cfa12b

altos: Fix up ms5607 and mma655x commands to work again

These just display the most recently fetched values

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/drivers/ao_mma655x.c b/src/drivers/ao_mma655x.c
index 18c5317c..28fe1e08 100644
--- a/src/drivers/ao_mma655x.c
+++ b/src/drivers/ao_mma655x.c
@@ -238,11 +238,12 @@ ao_mma655x_setup(void)
 
 }
 
+uint16_t	ao_mma655x_current;
+
 static void
 ao_mma655x_dump(void)
 {
-	ao_mma655x_setup();
-	printf ("MMA655X value %d\n", ao_mma655x_value());
+	printf ("MMA655X value %d\n", ao_mma655x_current);
 }
 
 __code struct ao_cmds ao_mma655x_cmds[] = {
@@ -250,8 +251,6 @@ __code struct ao_cmds ao_mma655x_cmds[] = {
 	{ 0, NULL },
 };
 
-uint16_t	ao_mma655x_current;
-
 static void
 ao_mma655x(void)
 {
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 492199b8..736e115b 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -241,13 +241,11 @@ ao_ms5607_info(void)
 static void
 ao_ms5607_dump(void)
 {
-	struct ao_data	data;
 	struct ao_ms5607_value value;
 
-	ao_data_get(&data);
-	ao_ms5607_convert(&data.ms5607_raw, &value);
-	printf ("Pressure:    %8u %8d\n", data.ms5607_raw.pres, value.pres);
-	printf ("Temperature: %8u %8d\n", data.ms5607_raw.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));
 }