#include "ao.h"
__xdata struct ao_config ao_config;
-__xdata uint8_t ao_config_loaded;
-__xdata uint8_t ao_config_dirty;
+__pdata uint8_t ao_config_loaded;
+__pdata uint8_t ao_config_dirty;
__xdata uint8_t ao_config_mutex;
#define AO_CONFIG_DEFAULT_MAIN_DEPLOY 250
ao_config_callsign_set(void) __reentrant
{
uint8_t c;
- char callsign[AO_MAX_CALLSIGN + 1];
+ static __xdata char callsign[AO_MAX_CALLSIGN + 1];
+ memset(callsign, '\0', sizeof callsign);
ao_cmd_white();
c = 0;
while (ao_cmd_lex_c != '\n') {
return;
ao_mutex_get(&ao_config_mutex);
_ao_config_get();
- while (c < AO_MAX_CALLSIGN + 1)
- callsign[c++] = '\0';
memcpy(&ao_config.callsign, &callsign,
AO_MAX_CALLSIGN + 1);
ao_config_dirty = 1;
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();
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;
}
#endif /* HAS_EEPROM */
struct ao_config_var {
- char cmd;
+ __code char *str;
void (*set)(void) __reentrant;
void (*show)(void) __reentrant;
- const char *help;
};
static void
__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)" },
+ { "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', ao_config_accel_calibrate_set, ao_config_accel_calibrate_show,
- "a <+g> <-g> Set accelerometer calibration (0 for auto)" },
+ { "a <+g> <-g>\0Accel calib (0 for auto)",
+ ao_config_accel_calibrate_set,ao_config_accel_calibrate_show },
#endif /* HAS_ACCEL */
- { 'f', ao_config_radio_cal_set, ao_config_radio_cal_show,
- "f <cal> Set radio calibration value (cal = rf/(xtal/2^16))" },
+ { "f <cal>\0Radio calib (cal = rf/(xtal/2^16))",
+ ao_config_radio_cal_set, ao_config_radio_cal_show },
#if HAS_EEPROM
- { 'l', ao_config_log_set, ao_config_log_show,
- "l <size> Set flight log size in kB" },
+ { "l <size>\0Flight log size in kB",
+ ao_config_log_set, ao_config_log_show },
#endif
- { 's', ao_config_show, ao_config_show,
- "s Show current config values" },
+ { "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_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));
}
static void
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)();
}