From: Keith Packard <keithp@keithp.com>
Date: Fri, 30 Aug 2013 00:22:18 +0000 (-0500)
Subject: altos: Split EasyMini and TeleMini log formats
X-Git-Tag: 1.2.9.4~116
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ce1378385ef273010498e81c205f42d8e32c7dc1

altos: Split EasyMini and TeleMini log formats

Same data, but EasyMini uses a 3.0V supply while TeleMini uses 3.3V,
which changes the intepretation of all of the ADC values

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

diff --git a/src/core/ao_log.h b/src/core/ao_log.h
index f6ab4520..a2f342d7 100644
--- a/src/core/ao_log.h
+++ b/src/core/ao_log.h
@@ -44,8 +44,9 @@ extern __pdata enum ao_flight_state ao_log_state;
 #define AO_LOG_FORMAT_TELEMETRY		3	/* 32 byte ao_telemetry records */
 #define AO_LOG_FORMAT_TELESCIENCE	4	/* 32 byte typed telescience records */
 #define AO_LOG_FORMAT_TELEMEGA		5	/* 32 byte typed telemega records */
-#define AO_LOG_FORMAT_MINI		6	/* 16-byte MS5607 baro only */
+#define AO_LOG_FORMAT_EASYMINI		6	/* 16-byte MS5607 baro only, 3.0V supply */
 #define AO_LOG_FORMAT_TELEMETRUM	7	/* 16-byte typed telemetrum records */
+#define AO_LOG_FORMAT_TELEMINI		8	/* 16-byte MS5607 baro only, 3.3V supply */
 #define AO_LOG_FORMAT_NONE		127	/* No log at all */
 
 extern __code uint8_t ao_log_format;
diff --git a/src/core/ao_log_mini.c b/src/core/ao_log_mini.c
index 46b285f3..99a85982 100644
--- a/src/core/ao_log_mini.c
+++ b/src/core/ao_log_mini.c
@@ -23,7 +23,7 @@
 static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_mini log;
 
-__code uint8_t ao_log_format = AO_LOG_FORMAT_MINI;
+__code uint8_t ao_log_format = AO_LOG_FORMAT;
 
 static uint8_t
 ao_log_csum(__xdata uint8_t *b) __reentrant
diff --git a/src/easymini-v0.1/ao_pins.h b/src/easymini-v0.1/ao_pins.h
index c09fb4c2..e0eb10bf 100644
--- a/src/easymini-v0.1/ao_pins.h
+++ b/src/easymini-v0.1/ao_pins.h
@@ -48,6 +48,8 @@
 
 #define PACKET_HAS_SLAVE	0
 
+#define AO_LOG_FORMAT		AO_LOG_FORMAT_EASYMINI
+
 /* USART */
 
 #define HAS_SERIAL		0
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index 264ad16d..c4681ee2 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -102,6 +102,7 @@
 #define AO_IGNITER_CHARGE_TIME	AO_MS_TO_TICKS(2000)
 
 #define AO_SEND_MINI
+#define AO_LOG_FORMAT		AO_LOG_FORMAT_TELEMINI
 
 /*
  * ADC