From: Keith Packard <keithp@keithp.com>
Date: Sat, 19 Mar 2011 03:26:12 +0000 (-0700)
Subject: altos: Fix mini/nano default log size to available flash space
X-Git-Tag: 0.9.3~131
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=dbe915795c66995805b5f37e6eb698cf2c143e61

altos: Fix mini/nano default log size to available flash space

Also, remove accel cal code from boards without accel

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

diff --git a/src/ao_config.c b/src/ao_config.c
index c6d36247..771b21a1 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -27,7 +27,11 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_CALLSIGN	"N0CALL"
 #define AO_CONFIG_DEFAULT_ACCEL_ZERO_G	16000
 #define AO_CONFIG_DEFAULT_APOGEE_DELAY	0
+#if USE_INTERNAL_EEPROM
+#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	ao_storage_config
+#else
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	((uint32_t) 192 * (uint32_t) 1024)
+#endif
 
 #if HAS_EEPROM
 static void
@@ -186,6 +190,7 @@ ao_config_main_deploy_set(void) __reentrant
 	ao_config_main_deploy_show();
 }
 
+#if HAS_ACCEL
 void
 ao_config_accel_calibrate_show(void) __reentrant
 {
@@ -252,6 +257,7 @@ ao_config_accel_calibrate_set(void) __reentrant
 	ao_mutex_put(&ao_config_mutex);
 	ao_config_accel_calibrate_show();
 }
+#endif /* HAS_ACCEL */
 
 void
 ao_config_apogee_delay_show(void) __reentrant
@@ -356,10 +362,10 @@ __code struct ao_config_var ao_config_vars[] = {
 		"r <channel> Set radio channel (freq = 434.550 + channel * .1)" },
 	{ 'c',	ao_config_callsign_set,		ao_config_callsign_show,
 		"c <call>    Set callsign broadcast in each packet (8 char max)" },
-#if HAS_ADC
+#if HAS_ACCEL
 	{ 'a',	ao_config_accel_calibrate_set,	ao_config_accel_calibrate_show,
 		"a <+g> <-g> Set accelerometer calibration (0 for auto)" },
-#endif /* HAS_ADC */
+#endif /* HAS_ACCEL */
 	{ 'f',  ao_config_radio_cal_set,  	ao_config_radio_cal_show,
 		"f <cal>     Set radio calibration value (cal = rf/(xtal/2^16))" },
 #if HAS_EEPROM
diff --git a/src/ao_pins.h b/src/ao_pins.h
index b4f177bf..c602268b 100644
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -26,6 +26,7 @@
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
 	#define HAS_DBG			1
 	#define USE_KALMAN		0
 	#define DBG_ON_P1 		1
@@ -50,6 +51,7 @@
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
 	#define HAS_DBG			1
 	#define USE_KALMAN		0
 	#define DBG_ON_P1 		1
@@ -99,6 +101,7 @@
 	#define HAS_SERIAL_1		0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	1
 	#define HAS_DBG			0
 	#define USE_KALMAN		1
 	#define IGNITE_ON_P2		0
@@ -121,6 +124,7 @@
 	#define HAS_SERIAL_1		0
 	#define HAS_ADC			1
 	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	1
 	#define HAS_DBG			0
 	#define USE_KALMAN		1
 	#define IGNITE_ON_P2		0
@@ -145,6 +149,7 @@
 	#define HAS_DBG			0
 	#define USE_KALMAN		0
 	#define HAS_EEPROM		1
+	#define USE_INTERNAL_FLASH	0
 	#define DBG_ON_P1 		0
 	#define DBG_ON_P0 		1
 	#define IGNITE_ON_P2		1
@@ -270,6 +275,12 @@
 #error Please define HAS_EEPROM
 #endif
 
+#if HAS_EEPROM
+#ifndef USE_INTERNAL_FLASH
+#error Please define USE_INTERNAL_FLASH
+#endif
+#endif
+
 #ifndef HAS_DBG
 #error Please define HAS_DBG
 #endif