X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=52c0c4f6f02e20a42fc99f4da5fb4788bb32b60c;hb=214a38eb2b084baec526aa42016eddb954038639;hp=b4847cddf9327e696579f1bf3e3e341567795a33;hpb=ec3de3ac461f2380d23c5c5d948333a9a210c400;p=fw%2Faltos

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index b4847cdd..52c0c4f6 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -44,6 +44,7 @@ __xdata uint8_t ao_config_mutex;
 #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
+#define AO_CONFIG_DEFAULT_PYRO_TIME	AO_MS_TO_TICKS(50)
 #if HAS_EEPROM
 #ifndef USE_INTERNAL_FLASH
 #error Please define USE_INTERNAL_FLASH
@@ -60,6 +61,8 @@ __xdata uint8_t ao_config_mutex;
 #define AO_CONFIG_DEFAULT_RADIO_POWER		0x60
 #endif
 #define AO_CONFIG_DEFAULT_RADIO_AMP		0
+#define AO_CONFIG_DEFAULT_APRS_SSID		(ao_serial_number % 10)
+#define AO_CONFIG_DEFAULT_RADIO_RATE		AO_RADIO_RATE_38400
 
 #if HAS_EEPROM
 static void
@@ -183,9 +186,21 @@ _ao_config_get(void)
 #endif
 #if HAS_TRACKER
 		if (minor < 17) {
-			ao_config.tracker_start_horiz = AO_CONFIG_DEFAULT_TRACKER_START_HORIZ;
-			ao_config.tracker_start_vert = AO_CONFIG_DEFAULT_TRACKER_START_VERT;
+			ao_config.tracker_motion = AO_TRACKER_MOTION_DEFAULT;
+			ao_config.tracker_interval = AO_TRACKER_INTERVAL_DEFAULT;
 		}
+#endif
+#if AO_PYRO_NUM
+		if (minor < 18)
+			ao_config.pyro_time = AO_CONFIG_DEFAULT_PYRO_TIME;
+#endif
+#if HAS_APRS
+		if (minor < 19)
+			ao_config.aprs_ssid = AO_CONFIG_DEFAULT_APRS_SSID;
+#endif
+#if HAS_RADIO_RATE
+		if (minor < 20)
+			ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
 #endif
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
@@ -278,6 +293,7 @@ ao_config_frequency_set(void) __reentrant
 	ao_radio_recv_abort();
 #endif
 }
+
 #endif
 
 #if HAS_FLIGHT
@@ -472,6 +488,30 @@ ao_config_radio_cal_set(void) __reentrant
 	ao_config_set_radio();
 	_ao_config_edit_finish();
 }
+
+#endif
+
+#if HAS_RADIO_RATE
+void
+ao_config_radio_rate_show(void) __reentrant
+{
+	printf("Telemetry rate: %d\n", ao_config.radio_rate);
+}
+
+void
+ao_config_radio_rate_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	if (AO_RADIO_RATE_MAX < ao_cmd_lex_i) {
+		ao_cmd_status = ao_cmd_lex_error;
+		return;
+	}
+	_ao_config_edit_start();
+	ao_config.radio_rate = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
 #endif
 
 #if HAS_LOG
@@ -690,29 +730,72 @@ void
 ao_config_tracker_show(void)
 {
 	printf ("Tracker setting: %d %d\n",
-		ao_config.tracker_start_horiz,
-		ao_config.tracker_start_vert);
+		ao_config.tracker_motion,
+		ao_config.tracker_interval);
 }
 
 void
 ao_config_tracker_set(void)
 {
-	uint16_t	h, v;
+	uint16_t	m, i;
 	ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	h = ao_cmd_lex_i;
+	m = ao_cmd_lex_i;
 	ao_cmd_decimal();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	v = ao_cmd_lex_i;
+	i = ao_cmd_lex_i;
 	_ao_config_edit_start();
-	ao_config.tracker_start_horiz = h;
-	ao_config.tracker_start_vert = v;
+	ao_config.tracker_motion = m;
+	ao_config.tracker_interval = i;
 	_ao_config_edit_finish();
 }
 #endif /* HAS_TRACKER */
 
+#if AO_PYRO_NUM
+void
+ao_config_pyro_time_show(void)
+{
+	printf ("Pyro time: %d\n", ao_config.pyro_time);
+}
+
+void
+ao_config_pyro_time_set(void)
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.pyro_time = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+#endif
+
+#if HAS_APRS
+void
+ao_config_aprs_ssid_show(void)
+{
+	printf ("APRS SSID: %d\n",
+		ao_config.aprs_ssid);
+}
+
+void
+ao_config_aprs_ssid_set(void)
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	if (15 < ao_cmd_lex_i) {
+		ao_cmd_status = ao_cmd_lex_error;
+		return;
+	}
+	_ao_config_edit_start();
+	ao_config.aprs_ssid = ao_cmd_lex_i;
+	_ao_config_edit_finish();
+}
+#endif /* HAS_APRS */
+
 struct ao_config_var {
 	__code char	*str;
 	void		(*set)(void) __reentrant;
@@ -748,6 +831,10 @@ __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_RATE
+	{ "T <rate>\0Telemetry rate (0=38.4, 1=9.6, 2=2.4)",
+	  ao_config_radio_rate_set,	ao_config_radio_rate_show },
+#endif
 #if HAS_RADIO_POWER
 	{ "p <setting>\0Radio power setting (0-255)",
 	  ao_config_radio_power_set,	ao_config_radio_power_show },
@@ -778,6 +865,8 @@ __code struct ao_config_var ao_config_vars[] = {
 #if AO_PYRO_NUM
 	{ "P <n,?>\0Pyro channels",
 	  ao_pyro_set, ao_pyro_show },
+	{ "I <ticks>\0Pyro firing time",
+	  ao_config_pyro_time_set, ao_config_pyro_time_show },
 #endif
 #if HAS_APRS
 	{ "A <secs>\0APRS packet interval (0 disable)",
@@ -788,8 +877,12 @@ __code struct ao_config_var ao_config_vars[] = {
 	  ao_config_beep_set, ao_config_beep_show },
 #endif
 #if HAS_TRACKER
-	{ "t <horiz> <vert>\0Tracker start trigger distances",
+	{ "t <motion> <interval>\0Tracker configuration",
 	  ao_config_tracker_set, ao_config_tracker_show },
+#endif
+#if HAS_APRS
+	{ "S <ssid>\0Set APRS SSID (0-15)",
+	  ao_config_aprs_ssid_set, ao_config_aprs_ssid_show },
 #endif
 	{ "s\0Show",
 	  ao_config_show,		0 },