#define AO_CONFIG_DEFAULT_CALLSIGN "N0CALL"
#define AO_CONFIG_DEFAULT_ACCEL_ZERO_G 16000
#define AO_CONFIG_DEFAULT_APOGEE_DELAY 0
+#if USE_INTERNAL_EEPROM
+#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 HAS_EEPROM
static void
_ao_config_put(void)
{
- ao_ee_write_config((uint8_t *) &ao_config, sizeof (ao_config));
+ ao_storage_setup();
+ ao_storage_erase(ao_storage_config);
+ ao_storage_write(ao_storage_config, &ao_config, sizeof (ao_config));
+ ao_log_write_erase(0);
+ ao_storage_flush();
+}
+
+void
+ao_config_put(void)
+{
+ ao_mutex_get(&ao_config_mutex);
+ _ao_config_put();
+ ao_mutex_put(&ao_config_mutex);
}
#endif
if (ao_config_loaded)
return;
#if HAS_EEPROM
- ao_ee_read_config((uint8_t *) &ao_config, sizeof (ao_config));
+ ao_storage_setup();
+ ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
#endif
if (ao_config.major != AO_CONFIG_MAJOR) {
ao_config.major = AO_CONFIG_MAJOR;
sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY;
ao_config.radio_cal = ao_radio_cal;
+ ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
ao_config_dirty = 1;
}
if (ao_config.minor < AO_CONFIG_MINOR) {
/* Fixups for minor version 3 */
if (ao_config.minor < 3)
ao_config.radio_cal = ao_radio_cal;
+ /* Fixups for minor version 4 */
+ if (ao_config.minor < 4)
+ ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
ao_config.minor = AO_CONFIG_MINOR;
ao_config_dirty = 1;
}
ao_config_dirty = 1;
ao_mutex_put(&ao_config_mutex);
ao_config_radio_channel_show();
- ao_radio_abort();
+ ao_radio_recv_abort();
}
#if HAS_ADC
ao_config_main_deploy_show();
}
+#if HAS_ACCEL
void
ao_config_accel_calibrate_show(void) __reentrant
{
int32_t accel_total;
uint8_t cal_adc_ring;
- printf("Orient %s and press a key...", orientation);
+ printf("Orient antenna %s and press a key...", orientation);
flush();
(void) getchar();
puts("\r\n"); flush();
puts("Calibrating..."); flush();
i = ACCEL_CALIBRATE_SAMPLES;
accel_total = 0;
- cal_adc_ring = ao_adc_head;
+ cal_adc_ring = ao_sample_adc;
while (i) {
- ao_sleep(&ao_adc_ring);
- while (i && cal_adc_ring != ao_adc_head) {
+ 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);
i--;
if (ao_cmd_status != ao_cmd_success)
return;
if (ao_cmd_lex_i == 0) {
- up = ao_config_accel_calibrate_auto("antenna up");
- down = ao_config_accel_calibrate_auto("antenna down");
+ up = ao_config_accel_calibrate_auto("up");
+ down = ao_config_accel_calibrate_auto("down");
} else {
up = ao_cmd_lex_i;
ao_cmd_decimal();
down = ao_cmd_lex_i;
}
if (up >= down) {
- printf("Invalid accel calibration: antenna up (%d) should be less than antenna down (%d)\n",
+ printf("Invalid accel: up (%d) down (%d)\n",
up, down);
return;
}
ao_mutex_put(&ao_config_mutex);
ao_config_accel_calibrate_show();
}
+#endif /* HAS_ACCEL */
void
ao_config_apogee_delay_show(void) __reentrant
ao_config_radio_cal_show();
}
+#if HAS_EEPROM
+void
+ao_config_log_show(void) __reentrant
+{
+ printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10));
+}
+
+void
+ao_config_log_set(void) __reentrant
+{
+ uint16_t block = (uint16_t) (ao_storage_block >> 10);
+ uint16_t config = (uint16_t) (ao_storage_config >> 10);
+
+ ao_cmd_decimal();
+ if (ao_cmd_status != ao_cmd_success)
+ return;
+ if (ao_log_present())
+ printf("Storage must be empty before changing log size\n");
+ else if (block > 1024 && (ao_cmd_lex_i & (block - 1)))
+ printf("Flight log size must be multiple of %d kB\n", block);
+ else if (ao_cmd_lex_i > config)
+ printf("Flight log max %d kB\n", config);
+ else {
+ ao_mutex_get(&ao_config_mutex);
+ _ao_config_get();
+ ao_config.flight_log_max = (uint32_t) ao_cmd_lex_i << 10;
+ ao_config_dirty = 1;
+ ao_mutex_put(&ao_config_mutex);
+ ao_config_log_show();
+ }
+}
+#endif /* HAS_EEPROM */
+
struct ao_config_var {
- char cmd;
+ const char *str;
void (*set)(void) __reentrant;
void (*show)(void) __reentrant;
- const char *help;
};
-void
+static void
ao_config_help(void) __reentrant;
-void
+static void
ao_config_show(void) __reentrant;
-void
+static void
ao_config_write(void) __reentrant;
__code struct ao_config_var ao_config_vars[] = {
#if HAS_ADC
- { 'm', ao_config_main_deploy_set, ao_config_main_deploy_show,
- "m <meters> Set height above launch for main deploy (in meters)" },
- { 'd', ao_config_apogee_delay_set, ao_config_apogee_delay_show,
- "d <delay> Set apogee igniter delay (in seconds)" },
+ { "m <meters>\0Main deploy (in meters)",
+ ao_config_main_deploy_set, ao_config_main_deploy_show, },
+ { "d <delay>\0Apogee delay (in seconds)",
+ ao_config_apogee_delay_set, ao_config_apogee_delay_show },
#endif /* HAS_ADC */
- { 'r', ao_config_radio_channel_set, ao_config_radio_channel_show,
- "r <channel> Set radio channel (freq = 434.550 + channel * .1)" },
- { 'c', ao_config_callsign_set, ao_config_callsign_show,
- "c <call> Set callsign broadcast in each packet (8 char max)" },
-#if HAS_ADC
- { 'a', ao_config_accel_calibrate_set, ao_config_accel_calibrate_show,
- "a <+g> <-g> Set accelerometer calibration (0 for auto)" },
-#endif /* HAS_ADC */
- { 'f', ao_config_radio_cal_set, ao_config_radio_cal_show,
- "f <cal> Set radio calibration value (cal = rf/(xtal/2^16))" },
- { 's', ao_config_show, ao_config_show,
- "s Show current config values" },
+ { "r <channel>\0Radio channel (freq = 434.550 + chan * .1)",
+ ao_config_radio_channel_set, ao_config_radio_channel_show },
+ { "c <call>\0Callsign (8 char max)",
+ ao_config_callsign_set, ao_config_callsign_show },
+#if HAS_ACCEL
+ { "a <+g> <-g>\0Accel calib (0 for auto)",
+ ao_config_accel_calibrate_set,ao_config_accel_calibrate_show },
+#endif /* HAS_ACCEL */
+ { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
+ ao_config_radio_cal_set, ao_config_radio_cal_show },
+#if HAS_EEPROM
+ { "l <size>\0Flight log size in kB",
+ ao_config_log_set, ao_config_log_show },
+#endif
+ { "s\0Show",
+ ao_config_show, ao_config_show },
#if HAS_EEPROM
- { 'w', ao_config_write, ao_config_write,
- "w Write current values to eeprom" },
+ { "w\0Write to eeprom",
+ ao_config_write, ao_config_write },
#endif
- { '?', ao_config_help, ao_config_help,
- "? Show available config variables" },
- { 0, ao_config_help, ao_config_help,
- NULL },
+ { "?\0Help",
+ ao_config_help, ao_config_help },
+ { 0, 0, 0 }
};
void
c = ao_cmd_lex_c;
ao_cmd_lex();
func = 0;
- for (cmd = 0; ao_config_vars[cmd].cmd != '\0'; cmd++)
- if (ao_config_vars[cmd].cmd == c) {
+ for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
+ if (ao_config_vars[cmd].str[0] == c) {
func = ao_config_vars[cmd].set;
break;
}
ao_cmd_status = ao_cmd_syntax_error;
}
-void
+static void
ao_config_help(void) __reentrant
{
uint8_t cmd;
- for (cmd = 0; ao_config_vars[cmd].cmd != '\0'; cmd++)
- puts (ao_config_vars[cmd].help);
+ 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));
}
-void
+static void
ao_config_show(void) __reentrant
{
uint8_t cmd;
printf("Config version: %d.%d\n",
ao_config.major, ao_config.minor);
- for (cmd = 0; ao_config_vars[cmd].cmd != '\0'; cmd++)
+ for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
if (ao_config_vars[cmd].show != ao_config_vars[cmd].set)
(*ao_config_vars[cmd].show)();
}
#if HAS_EEPROM
-void
+static void
ao_config_write(void) __reentrant
{
uint8_t saved = 0;
#endif
__code struct ao_cmds ao_config_cmds[] = {
- { 'c', ao_config_set, "c <var> <value> Set config variable (? for help, s to show)" },
- { '\0', ao_config_set, NULL },
+ { ao_config_set, "c <var> <value>\0Set config variable (? for help, s to show)" },
+ { 0, NULL },
};
void