X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=8dab7c42ad4ae06366f1364d1e7013aca1fd75a2;hb=211cb482e4da04dc032432abc236ef8b5a5e732f;hp=d1b931221ae395094e79d34b67ec500fb60c17f4;hpb=bb7522acf040f41740ecd059e3d5d2480b652420;p=fw%2Faltos

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index d1b93122..8dab7c42 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -93,10 +93,18 @@ ao_config_put(void)
 #endif
 
 #if HAS_RADIO
+
+#if HAS_RADIO_FORWARD
+__xdata uint32_t	ao_send_radio_setting;
+#endif
+
 void
 ao_config_set_radio(void)
 {
 	ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
+#if HAS_RADIO_FORWARD
+	ao_send_radio_setting = ao_freq_to_set(ao_config.send_frequency, ao_config.radio_cal);
+#endif
 }
 #endif /* HAS_RADIO */
 
@@ -207,6 +215,10 @@ _ao_config_get(void)
 #if HAS_RADIO_RATE
 		if (minor < 20)
 			ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE;
+#endif
+#if HAS_RADIO_FORWARD
+		if (minor < 21)
+			ao_config.send_frequency = 434550;
 #endif
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
@@ -302,6 +314,31 @@ ao_config_frequency_set(void) __reentrant
 
 #endif
 
+#if HAS_RADIO_FORWARD
+void
+ao_config_send_frequency_show(void) __reentrant
+{
+	printf("Send frequency: %ld\n",
+	       ao_config.send_frequency);
+}
+
+void
+ao_config_send_frequency_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.send_frequency = ao_cmd_lex_u32;
+	ao_config_set_radio();
+	_ao_config_edit_finish();
+#if HAS_RADIO_RECV
+	ao_radio_recv_abort();
+#endif
+}
+
+#endif
+
 #if HAS_FLIGHT
 
 void
@@ -520,10 +557,10 @@ ao_config_radio_rate_set(void) __reentrant
 	}
 	_ao_config_edit_start();
 	ao_config.radio_rate = ao_cmd_lex_i;
+	_ao_config_edit_finish();
 #if HAS_TELEMETRY
 	ao_telemetry_reset_interval();
 #endif
-	_ao_config_edit_finish();
 #if HAS_RADIO_RECV
 	ao_radio_recv_abort();
 #endif
@@ -647,6 +684,9 @@ ao_config_radio_enable_set(void) __reentrant
 	_ao_config_edit_start();
 	ao_config.radio_enable = ao_cmd_lex_i;
 	_ao_config_edit_finish();
+#if HAS_TELEMETRY && HAS_RADIO_RATE
+	ao_telemetry_reset_interval();
+#endif
 }
 #endif /* HAS_RADIO */
 
@@ -698,6 +738,7 @@ ao_config_aprs_set(void)
 	_ao_config_edit_start();
 	ao_config.aprs_interval = ao_cmd_lex_i;
 	_ao_config_edit_finish();
+	ao_telemetry_reset_interval();
 }
 
 #endif /* HAS_APRS */
@@ -788,6 +829,9 @@ ao_config_tracker_set(void)
 	ao_config.tracker_motion = m;
 	ao_config.tracker_interval = i;
 	_ao_config_edit_finish();
+#if HAS_TELEMETRY
+	ao_telemetry_reset_interval();
+#endif
 }
 #endif /* HAS_TRACKER */
 
@@ -863,6 +907,10 @@ __code struct ao_config_var ao_config_vars[] = {
 #if HAS_RADIO
 	{ "F <freq>\0Frequency (kHz)",
 	  ao_config_frequency_set, ao_config_frequency_show },
+#if HAS_RADIO_FORWARD
+	{ "R <freq>\0Repeater output frequency (kHz)",
+	  ao_config_send_frequency_set, ao_config_send_frequency_show },
+#endif
 	{ "c <call>\0Callsign (8 char max)",
 	  ao_config_callsign_set,	ao_config_callsign_show },
 	{ "e <0 disable, 1 enable>\0Enable telemetry and RDF",