X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_config.c;h=215dda92c5943ba6d64fcbed490a950eff58f894;hp=c7fc7dd234786debbe434da390ba378ff286d2c0;hb=6492218fc316f8cf6214a577807a8dd0a80a9b6a;hpb=06b6f78e22be38a26bfe11ed4d4b659d5b13f00c

diff --git a/src/ao_config.c b/src/ao_config.c
index c7fc7dd2..215dda92 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -18,8 +18,8 @@
 #include "ao.h"
 
 __xdata struct ao_config ao_config;
-__xdata uint8_t ao_config_loaded;
-__xdata uint8_t ao_config_dirty;
+__pdata uint8_t ao_config_loaded;
+__pdata uint8_t ao_config_dirty;
 __xdata uint8_t ao_config_mutex;
 
 #define AO_CONFIG_DEFAULT_MAIN_DEPLOY	250
@@ -27,6 +27,8 @@ __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
+#define AO_CONFIG_DEFAULT_IGNITE_MODE	AO_IGNITE_MODE_DUAL
+#define AO_CONFIG_DEFAULT_PAD_ORIENTATION	AO_PAD_ORIENTATION_ANTENNA_UP
 #if USE_INTERNAL_EEPROM
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	ao_storage_config
 #else
@@ -75,6 +77,8 @@ _ao_config_get(void)
 		ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
 		ao_config.radio_cal = ao_radio_cal;
 		ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
+		ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
+		ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
 		ao_config_dirty = 1;
 	}
 	if (ao_config.minor < AO_CONFIG_MINOR) {
@@ -92,6 +96,11 @@ _ao_config_get(void)
 		/* Fixups for minor version 4 */
 		if (ao_config.minor < 4)
 			ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
+		/* Fixupes for minor version 5 */
+		if (ao_config.minor < 5)
+			ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
+		if (ao_config.minor < 6)
+			ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
 	}
@@ -116,8 +125,9 @@ void
 ao_config_callsign_set(void) __reentrant
 {
 	uint8_t	c;
-	char callsign[AO_MAX_CALLSIGN + 1];
+	static __xdata char callsign[AO_MAX_CALLSIGN + 1];
 
+	memset(callsign, '\0', sizeof callsign);
 	ao_cmd_white();
 	c = 0;
 	while (ao_cmd_lex_c != '\n') {
@@ -131,8 +141,6 @@ ao_config_callsign_set(void) __reentrant
 		return;
 	ao_mutex_get(&ao_config_mutex);
 	_ao_config_get();
-	while (c < AO_MAX_CALLSIGN + 1)
-		callsign[c++] = '\0';
 	memcpy(&ao_config.callsign, &callsign,
 	       AO_MAX_CALLSIGN + 1);
 	ao_config_dirty = 1;
@@ -335,8 +343,59 @@ ao_config_log_set(void) __reentrant
 }
 #endif /* HAS_EEPROM */
 
+#if HAS_IGNITE
+void
+ao_config_ignite_mode_show(void) __reentrant
+{
+	printf("Ignite mode: %d\n", ao_config.ignite_mode);
+}
+
+void
+ao_config_ignite_mode_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	ao_mutex_get(&ao_config_mutex);
+	_ao_config_get();
+	ao_config.ignite_mode = ao_cmd_lex_i;
+	ao_config_dirty = 1;
+	ao_mutex_put(&ao_config_mutex);
+	ao_config_ignite_mode_show();
+}
+#endif
+
+#if HAS_IGNITE
+void
+ao_config_pad_orientation_show(void) __reentrant
+{
+	printf("Pad orientation: %d\n", ao_config.pad_orientation);
+}
+
+void
+ao_config_pad_orientation_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	ao_mutex_get(&ao_config_mutex);
+	_ao_config_get();
+	ao_cmd_lex_i &= 1;
+	if (ao_config.pad_orientation != ao_cmd_lex_i) {
+		uint16_t t;
+		t = ao_config.accel_plus_g;
+		ao_config.accel_plus_g = 0x7fff - ao_config.accel_minus_g;
+		ao_config.accel_minus_g = 0x7fff - t;
+	}
+	ao_config.pad_orientation = ao_cmd_lex_i;
+	ao_config_dirty = 1;
+	ao_mutex_put(&ao_config_mutex);
+	ao_config_pad_orientation_show();
+}
+#endif
+
 struct ao_config_var {
-	const char	*str;
+	__code char	*str;
 	void		(*set)(void) __reentrant;
 	void		(*show)(void) __reentrant;
 };
@@ -370,6 +429,14 @@ __code struct ao_config_var ao_config_vars[] = {
 #if HAS_EEPROM
 	{ "l <size>\0Flight log size in kB",
 	  ao_config_log_set,		ao_config_log_show },
+#endif
+#if HAS_IGNITE
+	{ "i <0 dual, 1 apogee, 2 main>\0Set igniter mode",
+	  ao_config_ignite_mode_set,	ao_config_ignite_mode_show },
+#endif
+#if HAS_ACCEL
+	{ "o <0 antenna up, 1 antenna down>\0Set pad orientation",
+	  ao_config_pad_orientation_set,ao_config_pad_orientation_show },
 #endif
 	{ "s\0Show",
 	  ao_config_show,		ao_config_show },