#define AO_CONFIG_DEFAULT_ACCEL_ZERO_G 16000
#define AO_CONFIG_DEFAULT_APOGEE_DELAY 0
#define AO_CONFIG_DEFAULT_IGNITE_MODE AO_IGNITE_MODE_DUAL
-#if USE_INTERNAL_EEPROM
+#define AO_CONFIG_DEFAULT_PAD_ORIENTATION AO_PAD_ORIENTATION_ANTENNA_UP
+#if HAS_EEPROM
+#ifndef USE_INTERNAL_FLASH
+#error Please define USE_INTERNAL_FLASH
+#endif
+#endif
+#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 (ao_config.major != AO_CONFIG_MAJOR) {
ao_config.major = AO_CONFIG_MAJOR;
- ao_config.minor = AO_CONFIG_MINOR;
+ ao_config.minor = 0;
ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
- ao_config.accel_plus_g = 0;
- ao_config.accel_minus_g = 0;
- memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
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.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
- ao_config_dirty = 1;
}
if (ao_config.minor < AO_CONFIG_MINOR) {
/* Fixups for minor version 1 */
/* Fixupes for minor version 5 */
if (ao_config.minor < 5)
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;
ao_config.minor = AO_CONFIG_MINOR;
ao_config_dirty = 1;
}
ao_config_loaded = 1;
}
-void
-ao_config_get(void)
+static void
+_ao_config_edit_start(void)
{
ao_mutex_get(&ao_config_mutex);
_ao_config_get();
+}
+
+static void
+_ao_config_edit_finish(void)
+{
+ ao_config_dirty = 1;
+ ao_mutex_put(&ao_config_mutex);
+}
+
+void
+ao_config_get(void)
+{
+ _ao_config_edit_start();
ao_mutex_put(&ao_config_mutex);
}
}
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
memcpy(&ao_config.callsign, &callsign,
AO_MAX_CALLSIGN + 1);
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_callsign_show();
+ _ao_config_edit_finish();
}
void
ao_config_radio_channel_show(void) __reentrant
{
- uint32_t freq = 434550L + ao_config.radio_channel * 100L;
- uint16_t mhz = freq / 1000L;
- uint16_t khz = freq % 1000L;
-
- printf("Radio channel: %d (%d.%03dMHz)\n",
- ao_config.radio_channel, mhz, khz);
+ printf("Radio channel: %d\n",
+ ao_config.radio_channel);
}
void
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
ao_config.radio_channel = ao_cmd_lex_i;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_radio_channel_show();
+ _ao_config_edit_finish();
ao_radio_recv_abort();
}
void
ao_config_main_deploy_show(void) __reentrant
{
- printf("Main deploy: %d meters (%d feet)\n",
- ao_config.main_deploy,
- (int16_t) ((int32_t) ao_config.main_deploy * 328 / 100));
+ printf("Main deploy: %d meters\n",
+ ao_config.main_deploy);
}
void
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
ao_config.main_deploy = ao_cmd_lex_i;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_main_deploy_show();
+ _ao_config_edit_finish();
}
#if HAS_ACCEL
up, down);
return;
}
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
ao_config.accel_plus_g = up;
ao_config.accel_minus_g = down;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_accel_calibrate_show();
+ _ao_config_edit_finish();
}
#endif /* HAS_ACCEL */
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
ao_config.apogee_delay = ao_cmd_lex_i;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_apogee_delay_show();
+ _ao_config_edit_finish();
}
#endif /* HAS_ADC */
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
- ao_config.radio_cal = ao_cmd_lex_u32;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_radio_cal_show();
+ _ao_config_edit_start();
+ ao_config.radio_setting = ao_config.radio_cal = ao_cmd_lex_u32;
+ _ao_config_edit_finish();
}
#if HAS_EEPROM
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_edit_start();
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();
+ _ao_config_edit_finish();
}
}
#endif /* HAS_EEPROM */
ao_cmd_decimal();
if (ao_cmd_status != ao_cmd_success)
return;
- ao_mutex_get(&ao_config_mutex);
- _ao_config_get();
+ _ao_config_edit_start();
ao_config.ignite_mode = ao_cmd_lex_i;
- ao_config_dirty = 1;
- ao_mutex_put(&ao_config_mutex);
- ao_config_log_show();
+ _ao_config_edit_finish();
+}
+#endif
+
+#if HAS_ACCEL
+void
+ao_config_pad_orientation_show(void) __reentrant
+{
+ printf("Pad orientation: %d\n", ao_config.pad_orientation);
+}
+
+void
+ao_config_pad_orientation_set(void) __reentrant
+{
+ ao_cmd_decimal();
+ if (ao_cmd_status != ao_cmd_success)
+ return;
+ _ao_config_edit_start();
+ ao_cmd_lex_i &= 1;
+ if (ao_config.pad_orientation != ao_cmd_lex_i) {
+ uint16_t t;
+ t = ao_config.accel_plus_g;
+ ao_config.accel_plus_g = 0x7fff - ao_config.accel_minus_g;
+ ao_config.accel_minus_g = 0x7fff - t;
+ }
+ ao_config.pad_orientation = ao_cmd_lex_i;
+ _ao_config_edit_finish();
}
#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();
+}
+
+void
+ao_config_radio_enable_show(void) __reentrant
+{
+ printf("Radio enable: %d\n", ao_config.radio_enable);
+}
+
+void
+ao_config_radio_enable_set(void) __reentrant
+{
+ ao_cmd_decimal();
+ if (ao_cmd_status != ao_cmd_success)
+ return;
+ _ao_config_edit_start();
+ ao_config.radio_enable = ao_cmd_lex_i;
+ _ao_config_edit_finish();
+}
+
struct ao_config_var {
__code char *str;
void (*set)(void) __reentrant;
ao_config_radio_channel_set, ao_config_radio_channel_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 },
#if HAS_ACCEL
{ "a <+g> <-g>\0Accel calib (0 for auto)",
ao_config_accel_calibrate_set,ao_config_accel_calibrate_show },
#if HAS_IGNITE
{ "i <0 dual, 1 apogee, 2 main>\0Set igniter mode",
ao_config_ignite_mode_set, ao_config_ignite_mode_show },
+#endif
+#if HAS_ACCEL
+ { "o <0 antenna up, 1 antenna down>\0Set pad orientation",
+ ao_config_pad_orientation_set,ao_config_pad_orientation_show },
#endif
{ "s\0Show",
- ao_config_show, ao_config_show },
+ ao_config_show, 0 },
#if HAS_EEPROM
{ "w\0Write to eeprom",
- ao_config_write, ao_config_write },
+ ao_config_write, 0 },
#endif
{ "?\0Help",
- ao_config_help, ao_config_help },
+ ao_config_help, 0 },
{ 0, 0, 0 }
};
func = 0;
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_vars[cmd].set)();
+ return;
}
- if (func)
- (*func)();
- else
- ao_cmd_status = ao_cmd_syntax_error;
+ ao_cmd_status = ao_cmd_syntax_error;
}
static void
printf("Config version: %d.%d\n",
ao_config.major, ao_config.minor);
for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
- if (ao_config_vars[cmd].show != ao_config_vars[cmd].set)
+ if (ao_config_vars[cmd].show)
(*ao_config_vars[cmd].show)();
}
projects / fw / altos / blobdiff