X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=8dab7c42ad4ae06366f1364d1e7013aca1fd75a2;hp=e5f8efba95c1255b5606e7d4212931bceaa12302;hb=4d51570ed8776461d084726149923c5be43d622e;hpb=2625a464417c8475c66101757ca2c30cd6c74e0c

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index e5f8efba..8dab7c42 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -44,22 +44,31 @@ __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
 #endif
 #endif
+
 #ifndef AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX
-#if USE_INTERNAL_FLASH
-#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 FLIGHT_LOG_APPEND
+#  define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX	ao_storage_log_max
+# else
+#  if USE_INTERNAL_FLASH
+#   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
+# endif
 #endif
+
 #ifndef AO_CONFIG_DEFAULT_RADIO_POWER
 #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
@@ -84,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 */
 
@@ -133,7 +150,7 @@ _ao_config_get(void)
 			ao_config.radio_cal = ao_radio_cal;
 #endif
 		/* Fixups for minor version 4 */
-#if HAS_FLIGHT
+#if HAS_LOG
 		if (minor < 4)
 			ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
 #endif
@@ -183,9 +200,25 @@ _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
+#if HAS_RADIO_FORWARD
+		if (minor < 21)
+			ao_config.send_frequency = 434550;
 #endif
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
@@ -278,6 +311,32 @@ ao_config_frequency_set(void) __reentrant
 	ao_radio_recv_abort();
 #endif
 }
+
+#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
@@ -472,18 +531,73 @@ ao_config_radio_cal_set(void) __reentrant
 	ao_config_set_radio();
 	_ao_config_edit_finish();
 }
+
+#endif
+
+#if HAS_RADIO_RATE
+#ifndef HAS_TELEMETRY
+#error Please define HAS_TELEMETRY
+#endif
+
+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();
+#if HAS_TELEMETRY
+	ao_telemetry_reset_interval();
+#endif
+#if HAS_RADIO_RECV
+	ao_radio_recv_abort();
+#endif
+}
 #endif
 
 #if HAS_LOG
+
 void
 ao_config_log_show(void) __reentrant
 {
 	printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10));
+#if FLIGHT_LOG_APPEND
+	printf("Log fixed: 1\n");
+#endif
+}
+
+#if FLIGHT_LOG_APPEND
+void
+ao_config_log_fix_append(void)
+{
+	_ao_config_edit_start();
+	ao_config.flight_log_max = ao_storage_log_max;
+	_ao_config_edit_finish();
+	ao_mutex_get(&ao_config_mutex);
+	_ao_config_put();
+	ao_config_dirty = 0;
+	ao_mutex_put(&ao_config_mutex);
 }
+#endif
 
 void
 ao_config_log_set(void) __reentrant
 {
+#if FLIGHT_LOG_APPEND
+	printf("Flight log fixed size %d kB\n", ao_storage_log_max >> 10);
+#else
 	uint16_t	block = (uint16_t) (ao_storage_block >> 10);
 	uint16_t	log_max = (uint16_t) (ao_storage_log_max >> 10);
 
@@ -501,6 +615,7 @@ ao_config_log_set(void) __reentrant
 		ao_config.flight_log_max = (uint32_t) ao_cmd_lex_i << 10;
 		_ao_config_edit_finish();
 	}
+#endif
 }
 #endif /* HAS_LOG */
 
@@ -569,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 */
 
@@ -620,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 */
@@ -690,29 +809,75 @@ 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();
+#if HAS_TELEMETRY
+	ao_telemetry_reset_interval();
+#endif
 }
 #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;
@@ -742,12 +907,20 @@ __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",
 	  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 +951,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 +963,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 },