}
#endif
-static void
+void
ao_config_set_radio(void)
{
ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
if (ao_config.minor < 8)
ao_config.radio_enable = TRUE;
+#if HAS_AES
if (ao_config.minor < 9)
- memset(&ao_config.aes_key, 0, AO_AES_LEN);
+ ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN);
+#endif
if (ao_config.minor < 10) {
ao_config.frequency = 434550;
#if HAS_RADIO_CHANNELS
return;
_ao_config_edit_start();
ao_config.frequency = ao_cmd_lex_u32;
+ ao_config.radio_channel = 0;
ao_config_set_radio();
_ao_config_edit_finish();
ao_radio_recv_abort();
__code struct ao_config_var ao_config_vars[] = {
#if HAS_ADC
- { "m <meters>\0Main deploy (in meters)",
+ { "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)",
+ { "r <channel>\0Radio channel",
ao_config_radio_channel_set, ao_config_radio_channel_show },
{ "F <freq>\0Frequency (kHz)",
ao_config_frequency_set, ao_config_frequency_show },
{ "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
ao_config_radio_cal_set, ao_config_radio_cal_show },
#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
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 },
};