*/
#include "ao.h"
+#include "ao_log.h"
+#include <ao_sample.h>
+#include <ao_data.h>
__xdata struct ao_config ao_config;
__pdata uint8_t ao_config_loaded;
#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
+#endif
#if HAS_EEPROM
static void
}
#endif
+#if HAS_RADIO
+void
+ao_config_set_radio(void)
+{
+ ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
+}
+#endif /* HAS_RADIO */
+
static void
_ao_config_get(void)
{
if (ao_config_loaded)
return;
#if HAS_EEPROM
+ /* Yes, I know ao_storage_read calls ao_storage_setup,
+ * but ao_storage_setup *also* sets ao_storage_config, which we
+ * need before calling ao_storage_read here
+ */
ao_storage_setup();
ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
#endif
/* Version 0 stuff */
ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
- ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
- memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
- memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
+ ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
+ ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN),
sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
ao_config_dirty = 1;
}
- if (ao_config.minor < AO_CONFIG_MINOR) {
+ if (ao_config.minor != AO_CONFIG_MINOR) {
/* Fixups for minor version 1 */
if (ao_config.minor < 1)
ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
ao_config.accel_minus_g = 0;
}
/* Fixups for minor version 3 */
+#if HAS_RADIO
if (ao_config.minor < 3)
ao_config.radio_cal = ao_radio_cal;
+#endif
/* Fixups for minor version 4 */
if (ao_config.minor < 4)
ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
if (ao_config.minor < 6)
ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
- if (ao_config.minor < 7)
- ao_config.radio_setting = ao_config.radio_cal;
if (ao_config.minor < 8)
ao_config.radio_enable = TRUE;
if (ao_config.minor < 9)
- memset(&ao_config.aes_key, 0, AO_AES_LEN);
+ ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
+ if (ao_config.minor < 10)
+ ao_config.frequency = 434550;
+ if (ao_config.minor < 11)
+ ao_config.apogee_lockout = 0;
ao_config.minor = AO_CONFIG_MINOR;
ao_config_dirty = 1;
}
+#if HAS_RADIO
+ ao_config_set_radio();
+#endif
ao_config_loaded = 1;
}
uint8_t c;
static __xdata char callsign[AO_MAX_CALLSIGN + 1];
- memset(callsign, '\0', sizeof callsign);
+ ao_xmemset(callsign, '\0', sizeof callsign);
ao_cmd_white();
c = 0;
while (ao_cmd_lex_c != '\n') {
if (ao_cmd_status != ao_cmd_success)
return;
_ao_config_edit_start();
- memcpy(&ao_config.callsign, &callsign,
+ ao_xmemcpy(&ao_config.callsign, &callsign,
AO_MAX_CALLSIGN + 1);
_ao_config_edit_finish();
}
+#if HAS_RADIO
void
-ao_config_radio_channel_show(void) __reentrant
+ao_config_frequency_show(void) __reentrant
{
- printf("Radio channel: %d\n",
- ao_config.radio_channel);
+ printf("Frequency: %ld\n",
+ ao_config.frequency);
}
void
-ao_config_radio_channel_set(void) __reentrant
+ao_config_frequency_set(void) __reentrant
{
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
_ao_config_edit_start();
- ao_config.radio_channel = ao_cmd_lex_i;
+ ao_config.frequency = ao_cmd_lex_u32;
+ ao_config_set_radio();
_ao_config_edit_finish();
ao_radio_recv_abort();
}
+#endif
-#if HAS_ADC
+#if HAS_FLIGHT
void
ao_config_main_deploy_show(void) __reentrant
{
uint16_t i;
int32_t accel_total;
- uint8_t cal_adc_ring;
+ uint8_t cal_data_ring;
printf("Orient antenna %s and press a key...", orientation);
flush();
puts("Calibrating..."); flush();
i = ACCEL_CALIBRATE_SAMPLES;
accel_total = 0;
- cal_adc_ring = ao_sample_adc;
+ cal_data_ring = ao_sample_data;
while (i) {
- ao_sleep(DATA_TO_XDATA(&ao_sample_adc));
- while (i && cal_adc_ring != ao_sample_adc) {
- accel_total += (int32_t) ao_adc_ring[cal_adc_ring].accel;
- cal_adc_ring = ao_adc_ring_next(cal_adc_ring);
+ ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+ while (i && cal_data_ring != ao_sample_data) {
+ accel_total += (int32_t) ao_data_accel(&ao_data_ring[cal_data_ring]);
+ cal_data_ring = ao_data_ring_next(cal_data_ring);
i--;
}
}
_ao_config_edit_finish();
}
-#endif /* HAS_ADC */
+void
+ao_config_apogee_lockout_show(void) __reentrant
+{
+ printf ("Apogee lockout: %d seconds\n",
+ ao_config.apogee_lockout);
+}
+
+void
+ao_config_apogee_lockout_set(void) __reentrant
+{
+ ao_cmd_decimal();
+ if (ao_cmd_status != ao_cmd_success)
+ return;
+ _ao_config_edit_start();
+ ao_config.apogee_lockout = ao_cmd_lex_i;
+ _ao_config_edit_finish();
+}
+
+#endif /* HAS_FLIGHT */
+#if HAS_RADIO
void
ao_config_radio_cal_show(void) __reentrant
{
if (ao_cmd_status != ao_cmd_success)
return;
_ao_config_edit_start();
- ao_config.radio_setting = ao_config.radio_cal = ao_cmd_lex_u32;
+ ao_config.radio_cal = ao_cmd_lex_u32;
+ ao_config_set_radio();
_ao_config_edit_finish();
}
+#endif
#if HAS_LOG
void
}
#endif
-void
-ao_config_radio_setting_show(void) __reentrant
-{
- printf("Radio setting: %ld\n", ao_config.radio_setting);
-}
-
-void
-ao_config_radio_setting_set(void) __reentrant
-{
- ao_cmd_decimal();
- if (ao_cmd_status != ao_cmd_success)
- return;
- _ao_config_edit_start();
- ao_config.radio_setting = ao_cmd_lex_u32;
- ao_config.radio_channel = 0;
- _ao_config_edit_finish();
- ao_radio_recv_abort();
-}
-
+#if HAS_RADIO
void
ao_config_radio_enable_show(void) __reentrant
{
ao_config.radio_enable = ao_cmd_lex_i;
_ao_config_edit_finish();
}
+#endif /* HAS_RADIO */
#if HAS_AES
void
ao_config_write(void) __reentrant;
__code struct ao_config_var ao_config_vars[] = {
-#if HAS_ADC
- { "m <meters>\0Main deploy (in meters)",
+#if HAS_FLIGHT
+ { "m <meters>\0Main deploy (m)",
ao_config_main_deploy_set, ao_config_main_deploy_show, },
- { "d <delay>\0Apogee delay (in seconds)",
+ { "d <delay>\0Apogee delay (s)",
ao_config_apogee_delay_set, ao_config_apogee_delay_show },
-#endif /* HAS_ADC */
- { "r <channel>\0Radio channel (freq = 434.550 + chan * .1)",
- ao_config_radio_channel_set, ao_config_radio_channel_show },
+ { "L <seconds>\0Apogee detect lockout (s)",
+ ao_config_apogee_lockout_set, ao_config_apogee_lockout_show, },
+#endif /* HAS_FLIGHT */
+#if HAS_RADIO
+ { "F <freq>\0Frequency (kHz)",
+ ao_config_frequency_set, ao_config_frequency_show },
{ "c <call>\0Callsign (8 char max)",
ao_config_callsign_set, ao_config_callsign_show },
- { "R <setting>\0Radio freq control (freq = 434.550 * setting/cal)",
- ao_config_radio_setting_set, ao_config_radio_setting_show },
{ "e <0 disable, 1 enable>\0Enable telemetry and RDF",
ao_config_radio_enable_set, ao_config_radio_enable_show },
+#endif /* HAS_RADIO */
#if HAS_ACCEL
{ "a <+g> <-g>\0Accel calib (0 for auto)",
ao_config_accel_calibrate_set,ao_config_accel_calibrate_show },
#endif /* HAS_ACCEL */
+#if HAS_RADIO
{ "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
ao_config_radio_cal_set, ao_config_radio_cal_show },
+#endif /* HAS_RADIO */
#if HAS_LOG
- { "l <size>\0Flight log size in kB",
+ { "l <size>\0Flight log size (kB)",
ao_config_log_set, ao_config_log_show },
#endif
#if HAS_IGNITE
for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
printf("%-20s %s\n",
ao_config_vars[cmd].str,
- ao_config_vars[cmd].str+1+strlen(ao_config_vars[cmd].str));
+ ao_config_vars[cmd].str+1+
+ strlen(ao_config_vars[cmd].str));
}
static void
ao_config_show(void) __reentrant
{
uint8_t cmd;
+ ao_config_get();
printf("Config version: %d.%d\n",
ao_config.major, ao_config.minor);
for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
#endif
__code struct ao_cmds ao_config_cmds[] = {
- { ao_config_set, "c <var> <value>\0Set config variable (? for help, s to show)" },
+ { ao_config_set, "c <var> <value>\0Set config (? for help, s to show)" },
{ 0, NULL },
};