X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_config.c;h=b480e14c40edd3effc85b0da3f6474283bdd669a;hp=797fe7ec6aedfec9db3eae4fbda5b13b9ad2c936;hb=e0a0a747624c2df66ca4a73b5a0de014ea204dca;hpb=b4e86af6de52ea0bacf80e3936b6cd17c1cbf898

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 797fe7ec..b480e14c 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -28,6 +28,9 @@ __pdata uint8_t ao_config_loaded;
 __pdata uint8_t ao_config_dirty;
 __xdata uint8_t ao_config_mutex;
 
+#ifndef AO_CONFIG_DEFAULT_APRS_INTERVAL
+#define AO_CONFIG_DEFAULT_APRS_INTERVAL	0
+#endif
 #define AO_CONFIG_DEFAULT_MAIN_DEPLOY	250
 #define AO_CONFIG_DEFAULT_RADIO_CHANNEL	0
 #define AO_CONFIG_DEFAULT_CALLSIGN	"N0CALL"
@@ -47,6 +50,10 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	((uint32_t) 192 * (uint32_t) 1024)
 #endif
 #endif
+#ifndef AO_CONFIG_DEFAULT_RADIO_POWER
+#define AO_CONFIG_DEFAULT_RADIO_POWER		0x60
+#endif
+#define AO_CONFIG_DEFAULT_RADIO_AMP		0
 
 #if HAS_EEPROM
 static void
@@ -128,7 +135,7 @@ _ao_config_get(void)
 		if (minor < 6)
 			ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
 		if (minor < 8)
-			ao_config.radio_enable = TRUE;
+			ao_config.radio_enable = AO_RADIO_ENABLE_CORE;
 		if (minor < 9)
 			ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
 		if (minor < 10)
@@ -138,6 +145,16 @@ _ao_config_get(void)
 #if AO_PYRO_NUM
 		if (minor < 12)
 			memset(&ao_config.pyro, '\0', sizeof (ao_config.pyro));
+#endif
+		if (minor < 13)
+			ao_config.aprs_interval = AO_CONFIG_DEFAULT_APRS_INTERVAL;
+#if HAS_RADIO_POWER
+		if (minor < 14)
+			ao_config.radio_power = AO_CONFIG_DEFAULT_RADIO_POWER;
+		#endif
+#if HAS_RADIO_AMP
+		if (minor  < 14)
+			ao_config.radio_amp = AO_CONFIG_DEFAULT_RADIO_AMP;
 #endif
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
@@ -208,6 +225,7 @@ ao_config_callsign_set(void) __reentrant
 }
 
 #if HAS_RADIO
+
 void
 ao_config_frequency_show(void) __reentrant
 {
@@ -225,7 +243,9 @@ ao_config_frequency_set(void) __reentrant
 	ao_config.frequency = ao_cmd_lex_u32;
 	ao_config_set_radio();
 	_ao_config_edit_finish();
+#if HAS_RADIO_RECV
 	ao_radio_recv_abort();
+#endif
 }
 #endif
 
@@ -498,6 +518,69 @@ ao_config_key_set(void) __reentrant
 }
 #endif
 
+#if HAS_APRS
+
+void
+ao_config_aprs_show(void)
+{
+	printf ("APRS interval: %d\n", ao_config.aprs_interval);
+}
+
+void
+ao_config_aprs_set(void)
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.aprs_interval = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+
+#endif /* HAS_APRS */
+
+#if HAS_RADIO_AMP
+
+void
+ao_config_radio_amp_show(void)
+{
+	printf ("Radio amp setting: %d\n", ao_config.radio_amp);
+}
+
+void
+ao_config_radio_amp_set(void)
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.radio_amp = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+
+#endif
+
+#if HAS_RADIO_POWER
+
+void
+ao_config_radio_power_show(void)
+{
+	printf ("Radio power setting: %d\n", ao_config.radio_power);
+}
+
+void
+ao_config_radio_power_set(void)
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.radio_power = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+
+#endif
+
 struct ao_config_var {
 	__code char	*str;
 	void		(*set)(void) __reentrant;
@@ -531,6 +614,14 @@ __code struct ao_config_var ao_config_vars[] = {
 	  ao_config_radio_enable_set, ao_config_radio_enable_show },
 	{ "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
 	  ao_config_radio_cal_set,  	ao_config_radio_cal_show },
+#if HAS_RADIO_POWER
+	{ "p <setting>\0Radio power setting (0-255)",
+	  ao_config_radio_power_set,	ao_config_radio_power_show },
+#endif
+#if HAS_RADIO_AMP
+	{ "d <setting>\0Radio amplifier setting (0-3)",
+	  ao_config_radio_amp_set,	ao_config_radio_amp_show },
+#endif
 #endif /* HAS_RADIO */
 #if HAS_ACCEL
 	{ "a <+g> <-g>\0Accel calib (0 for auto)",
@@ -553,6 +644,10 @@ __code struct ao_config_var ao_config_vars[] = {
 #if AO_PYRO_NUM
 	{ "P <n,?>\0Configure pyro channels",
 	  ao_pyro_set, ao_pyro_show },
+#endif
+#if HAS_APRS
+	{ "A <secs>\0APRS packet interval (0 disable)",
+	  ao_config_aprs_set, ao_config_aprs_show },
 #endif
 	{ "s\0Show",
 	  ao_config_show,		0 },
@@ -603,6 +698,9 @@ ao_config_show(void) __reentrant
 	for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
 		if (ao_config_vars[cmd].show)
 			(*ao_config_vars[cmd].show)();
+#if HAS_MS5607
+	ao_ms5607_info();
+#endif
 }
 
 #if HAS_EEPROM