X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=ece60ad355124e4bdcf4a703b6e8434713f82433;hp=83a8cd77092e7449509ee75fa7d38907c2c18c46;hb=568379f381dbb4bf587e95ce1d9c400e856ff6c6;hpb=e05e0c6b71a1df65f188e00622e9632eb27510fd diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c index 83a8cd77..ece60ad3 100644 --- a/src/kernel/ao_config.c +++ b/src/kernel/ao_config.c @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -29,10 +30,18 @@ #include #endif -__xdata struct ao_config ao_config; -__pdata uint8_t ao_config_loaded; -__pdata uint8_t ao_config_dirty; -__xdata uint8_t ao_config_mutex; +struct ao_config ao_config; +uint8_t ao_config_loaded; +uint8_t ao_config_dirty; +uint8_t ao_config_mutex; + +#if HAS_FORCE_FREQ +uint8_t ao_force_freq; +#endif + +#ifndef HAS_CONFIG_SAVE +#define HAS_CONFIG_SAVE HAS_EEPROM +#endif #ifndef AO_CONFIG_DEFAULT_APRS_INTERVAL #define AO_CONFIG_DEFAULT_APRS_INTERVAL 0 @@ -45,7 +54,7 @@ __xdata uint8_t ao_config_mutex; #define AO_CONFIG_DEFAULT_IGNITE_MODE AO_IGNITE_MODE_DUAL #define AO_CONFIG_DEFAULT_PAD_ORIENTATION AO_PAD_ORIENTATION_ANTENNA_UP #define AO_CONFIG_DEFAULT_PYRO_TIME AO_MS_TO_TICKS(50) -#if HAS_EEPROM +#if HAS_CONFIG_SAVE #ifndef USE_INTERNAL_FLASH #error Please define USE_INTERNAL_FLASH #endif @@ -70,14 +79,14 @@ __xdata uint8_t ao_config_mutex; #define AO_CONFIG_DEFAULT_APRS_SSID (ao_serial_number % 10) #define AO_CONFIG_DEFAULT_RADIO_RATE AO_RADIO_RATE_38400 -#if HAS_EEPROM +#if HAS_CONFIG_SAVE static void _ao_config_put(void) { ao_config_setup(); ao_config_erase(); ao_config_write(0, &ao_config, sizeof (ao_config)); -#if HAS_FLIGHT +#if HAS_FLIGHT && HAS_LOG ao_log_write_erase(0); #endif ao_config_flush(); @@ -95,7 +104,7 @@ ao_config_put(void) #if HAS_RADIO #if HAS_RADIO_FORWARD -__xdata uint32_t ao_send_radio_setting; +uint32_t ao_send_radio_setting; #endif void @@ -115,7 +124,7 @@ _ao_config_get(void) if (ao_config_loaded) return; -#if HAS_EEPROM +#if HAS_CONFIG_SAVE /* 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 @@ -129,13 +138,16 @@ _ao_config_get(void) /* Version 0 stuff */ ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY; - ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign)); - ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN), + 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._legacy_radio_channel = 0; } minor = ao_config.minor; if (minor != AO_CONFIG_MINOR) { +#if AO_PYRO_NUM + ao_pyro_update_version(); +#endif /* Fixups for minor version 1 */ if (minor < 1) ao_config.apogee_delay = AO_CONFIG_DEFAULT_APOGEE_DELAY; @@ -162,7 +174,7 @@ _ao_config_get(void) if (minor < 8) ao_config.radio_enable = AO_RADIO_ENABLE_CORE; if (minor < 9) - ao_xmemset(&ao_config.aes_key, '\0', AO_AES_LEN); + memset(&ao_config.aes_key, '\0', AO_AES_LEN); if (minor < 10) ao_config.frequency = 434550 + ao_config._legacy_radio_channel * 100; if (minor < 11) @@ -181,7 +193,7 @@ _ao_config_get(void) if (minor < 14) ao_config.radio_amp = AO_CONFIG_DEFAULT_RADIO_AMP; #endif -#if HAS_GYRO +#if HAS_IMU if (minor < 15) { ao_config.accel_zero_along = 0; ao_config.accel_zero_across = 0; @@ -194,7 +206,7 @@ _ao_config_get(void) ao_config.accel_minus_g = 0; } #endif -#if HAS_BEEP_CONFIG +#if HAS_BEEP if (minor < 16) ao_config.mid_beep = AO_BEEP_MID_DEFAULT; #endif @@ -219,6 +231,20 @@ _ao_config_get(void) #if HAS_RADIO_FORWARD if (minor < 21) ao_config.send_frequency = 434550; +#endif +#if HAS_APRS + if (minor < 22) + ao_config.aprs_format = AO_CONFIG_DEFAULT_APRS_FORMAT; +#endif +#if HAS_FIXED_PAD_BOX + if (minor < 22) + ao_config.pad_box = 1; + if (minor < 23) + ao_config.pad_idle = 120; +#endif +#if HAS_APRS + if (minor < 24) + ao_config.aprs_offset = 0; #endif ao_config.minor = AO_CONFIG_MINOR; ao_config_dirty = 1; @@ -228,7 +254,10 @@ _ao_config_get(void) if (ao_force_freq) { ao_config.frequency = 434550; ao_config.radio_cal = ao_radio_cal; - ao_xmemcpy(&ao_config.callsign, CODE_TO_XDATA(AO_CONFIG_DEFAULT_CALLSIGN), +#if HAS_RADIO_RATE + ao_config.radio_rate = AO_CONFIG_DEFAULT_RADIO_RATE; +#endif + memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN, sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1); } #endif @@ -258,19 +287,21 @@ ao_config_get(void) ao_mutex_put(&ao_config_mutex); } -void +#if HAS_RADIO + +static void ao_config_callsign_show(void) { printf ("Callsign: \"%s\"\n", ao_config.callsign); } -void -ao_config_callsign_set(void) __reentrant +static void +ao_config_callsign_set(void) { uint8_t c; - static __xdata char callsign[AO_MAX_CALLSIGN + 1]; + static char callsign[AO_MAX_CALLSIGN + 1]; - ao_xmemset(callsign, '\0', sizeof callsign); + memset(callsign, '\0', sizeof callsign); ao_cmd_white(); c = 0; while (ao_cmd_lex_c != '\n') { @@ -283,28 +314,26 @@ ao_config_callsign_set(void) __reentrant if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_xmemcpy(&ao_config.callsign, &callsign, + memcpy(&ao_config.callsign, &callsign, AO_MAX_CALLSIGN + 1); _ao_config_edit_finish(); } -#if HAS_RADIO - -void -ao_config_frequency_show(void) __reentrant +static void +ao_config_frequency_show(void) { printf("Frequency: %ld\n", ao_config.frequency); } -void -ao_config_frequency_set(void) __reentrant +static void +ao_config_frequency_set(void) { - ao_cmd_decimal(); + uint32_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.frequency = ao_cmd_lex_u32; + ao_config.frequency = r; ao_config_set_radio(); _ao_config_edit_finish(); #if HAS_RADIO_RECV @@ -316,14 +345,14 @@ ao_config_frequency_set(void) __reentrant #if HAS_RADIO_FORWARD void -ao_config_send_frequency_show(void) __reentrant +ao_config_send_frequency_show(void) { printf("Send frequency: %ld\n", ao_config.send_frequency); } void -ao_config_send_frequency_set(void) __reentrant +ao_config_send_frequency_set(void) { ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) @@ -341,31 +370,35 @@ ao_config_send_frequency_set(void) __reentrant #if HAS_FLIGHT -void -ao_config_main_deploy_show(void) __reentrant +#if HAS_BARO + +static void +ao_config_main_deploy_show(void) { printf("Main deploy: %d meters\n", ao_config.main_deploy); } -void -ao_config_main_deploy_set(void) __reentrant +static void +ao_config_main_deploy_set(void) { - ao_cmd_decimal(); + uint32_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.main_deploy = ao_cmd_lex_i; + ao_config.main_deploy = r; _ao_config_edit_finish(); } +#endif + #if HAS_ACCEL -void -ao_config_accel_calibrate_show(void) __reentrant +static void +ao_config_accel_calibrate_show(void) { printf("Accel cal +1g: %d -1g: %d\n", ao_config.accel_plus_g, ao_config.accel_minus_g); -#if HAS_GYRO +#if HAS_IMU printf ("IMU cal along %d across %d through %d\n", ao_config.accel_zero_along, ao_config.accel_zero_across, @@ -376,20 +409,19 @@ ao_config_accel_calibrate_show(void) __reentrant #define ACCEL_CALIBRATE_SAMPLES 1024 #define ACCEL_CALIBRATE_SHIFT 10 -#if HAS_GYRO +#if HAS_IMU static int16_t accel_cal_along; static int16_t accel_cal_across; static int16_t accel_cal_through; #endif static int16_t -ao_config_accel_calibrate_auto(char *orientation) __reentrant +ao_config_accel_calibrate_auto(char *orientation) { uint16_t i; int32_t accel_total; uint8_t cal_data_ring; - int16_t min = 32767, max = -32768; -#if HAS_GYRO +#if HAS_IMU int32_t accel_along_total = 0; int32_t accel_across_total = 0; int32_t accel_through_total = 0; @@ -404,13 +436,10 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant accel_total = 0; cal_data_ring = ao_sample_data; while (i) { - ao_sleep(DATA_TO_XDATA(&ao_sample_data)); + ao_sleep(&ao_sample_data); while (i && cal_data_ring != ao_sample_data) { - int16_t v = ao_data_accel(&ao_data_ring[cal_data_ring]); - accel_total += (int32_t) v; - if (v < min) min = v; - if (v > max) max = v; -#if HAS_GYRO + accel_total += (int32_t) ao_data_accel(&ao_data_ring[cal_data_ring]); +#if HAS_IMU accel_along_total += (int32_t) ao_data_along(&ao_data_ring[cal_data_ring]); accel_across_total += (int32_t) ao_data_across(&ao_data_ring[cal_data_ring]); accel_through_total += (int32_t) ao_data_through(&ao_data_ring[cal_data_ring]); @@ -419,47 +448,43 @@ ao_config_accel_calibrate_auto(char *orientation) __reentrant i--; } } -#if HAS_GYRO +#if HAS_IMU accel_cal_along = accel_along_total >> ACCEL_CALIBRATE_SHIFT; accel_cal_across = accel_across_total >> ACCEL_CALIBRATE_SHIFT; accel_cal_through = accel_through_total >> ACCEL_CALIBRATE_SHIFT; #endif - printf ("total %d min %d max %d\n", accel_total, min, max); return accel_total >> ACCEL_CALIBRATE_SHIFT; } -void -ao_config_accel_calibrate_set(void) __reentrant +static void +ao_config_accel_calibrate_set(void) { int16_t up, down; -#if HAS_GYRO + bool auto_cal; +#if HAS_IMU int16_t accel_along_up = 0, accel_along_down = 0; int16_t accel_across_up = 0, accel_across_down = 0; int16_t accel_through_up = 0, accel_through_down = 0; #endif - ao_cmd_decimal(); + up = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - if (ao_cmd_lex_i == 0) { + down = ao_cmd_decimal(); + auto_cal = (up == 0 && ao_cmd_status != ao_cmd_success); + if (auto_cal) { up = ao_config_accel_calibrate_auto("up"); -#if HAS_GYRO +#if HAS_IMU accel_along_up = accel_cal_along; accel_across_up = accel_cal_across; accel_through_up = accel_cal_through; #endif down = ao_config_accel_calibrate_auto("down"); -#if HAS_GYRO +#if HAS_IMU accel_along_down = accel_cal_along; accel_across_down = accel_cal_across; accel_through_down = accel_cal_through; #endif - } else { - up = ao_cmd_lex_i; - ao_cmd_decimal(); - if (ao_cmd_status != ao_cmd_success) - return; - down = ao_cmd_lex_i; } if (up >= down) { printf("Invalid accel: up (%d) down (%d)\n", @@ -469,70 +494,86 @@ ao_config_accel_calibrate_set(void) __reentrant _ao_config_edit_start(); ao_config.accel_plus_g = up; ao_config.accel_minus_g = down; -#if HAS_GYRO - if (ao_cmd_lex_i == 0) { +#if HAS_IMU + if (auto_cal) { ao_config.accel_zero_along = (accel_along_up + accel_along_down) / 2; ao_config.accel_zero_across = (accel_across_up + accel_across_down) / 2; ao_config.accel_zero_through = (accel_through_up + accel_through_down) / 2; + } else { + int16_t v; + + v = ao_cmd_decimal(); + if (ao_cmd_status == ao_cmd_success) { + ao_config.accel_zero_along = v; + v = ao_cmd_decimal(); + if (ao_cmd_status == ao_cmd_success) { + ao_config.accel_zero_across = v; + v = ao_cmd_decimal(); + if (ao_cmd_status == ao_cmd_success) + ao_config.accel_zero_through = v; + } + } } #endif _ao_config_edit_finish(); } #endif /* HAS_ACCEL */ -void -ao_config_apogee_delay_show(void) __reentrant +#if HAS_BARO +static void +ao_config_apogee_delay_show(void) { printf("Apogee delay: %d seconds\n", ao_config.apogee_delay); } -void -ao_config_apogee_delay_set(void) __reentrant +static void +ao_config_apogee_delay_set(void) { - ao_cmd_decimal(); + uint32_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.apogee_delay = ao_cmd_lex_i; + ao_config.apogee_delay = r; _ao_config_edit_finish(); } -void -ao_config_apogee_lockout_show(void) __reentrant +static void +ao_config_apogee_lockout_show(void) { printf ("Apogee lockout: %d seconds\n", ao_config.apogee_lockout); } -void -ao_config_apogee_lockout_set(void) __reentrant +static void +ao_config_apogee_lockout_set(void) { - ao_cmd_decimal(); + uint16_t r = 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.apogee_lockout = r; _ao_config_edit_finish(); } +#endif #endif /* HAS_FLIGHT */ #if HAS_RADIO -void -ao_config_radio_cal_show(void) __reentrant +static void +ao_config_radio_cal_show(void) { printf("Radio cal: %ld\n", ao_config.radio_cal); } -void -ao_config_radio_cal_set(void) __reentrant +static void +ao_config_radio_cal_set(void) { - ao_cmd_decimal(); + uint32_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.radio_cal = ao_cmd_lex_u32; + ao_config.radio_cal = r; ao_config_set_radio(); _ao_config_edit_finish(); } @@ -544,24 +585,24 @@ ao_config_radio_cal_set(void) __reentrant #error Please define HAS_TELEMETRY #endif -void -ao_config_radio_rate_show(void) __reentrant +static void +ao_config_radio_rate_show(void) { printf("Telemetry rate: %d\n", ao_config.radio_rate); } -void -ao_config_radio_rate_set(void) __reentrant +static void +ao_config_radio_rate_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - if (AO_RADIO_RATE_MAX < ao_cmd_lex_i) { + if (AO_RADIO_RATE_MAX < r) { ao_cmd_status = ao_cmd_lex_error; return; } _ao_config_edit_start(); - ao_config.radio_rate = ao_cmd_lex_i; + ao_config.radio_rate = r; _ao_config_edit_finish(); #if HAS_TELEMETRY ao_telemetry_reset_interval(); @@ -574,8 +615,8 @@ ao_config_radio_rate_set(void) __reentrant #if HAS_LOG -void -ao_config_log_show(void) __reentrant +static void +ao_config_log_show(void) { printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10)); #if FLIGHT_LOG_APPEND @@ -583,7 +624,7 @@ ao_config_log_show(void) __reentrant #endif } -#if FLIGHT_LOG_APPEND +#if FLIGHT_LOG_APPEND && HAS_CONFIG_SAVE void ao_config_log_fix_append(void) { @@ -597,97 +638,93 @@ ao_config_log_fix_append(void) } #endif -void -ao_config_log_set(void) __reentrant +static void +ao_config_log_set(void) { #if FLIGHT_LOG_APPEND - printf("Flight log fixed size %d kB\n", ao_storage_log_max >> 10); + printf("Flight log fixed size %u kB\n", (unsigned) (ao_storage_log_max >> 10)); #else - uint16_t block = (uint16_t) (ao_storage_block >> 10); - uint16_t log_max = (uint16_t) (ao_storage_log_max >> 10); + uint32_t r; - ao_cmd_decimal(); + r = 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 > log_max) - printf("Flight log max %d kB\n", log_max); - else { - _ao_config_edit_start(); - ao_config.flight_log_max = (uint32_t) ao_cmd_lex_i << 10; - _ao_config_edit_finish(); + r = r << 10; + if (ao_log_present()) { + if (r != ao_config.flight_log_max) + printf("Storage must be empty before changing log size\n"); + return; } + if (r > ao_storage_log_max) { + printf("Flight log max %u kB\n", (unsigned) (ao_storage_log_max >> 10)); + return; + } + _ao_config_edit_start(); + ao_config.flight_log_max = r & ~(ao_storage_block - 1); + _ao_config_edit_finish(); #endif } #endif /* HAS_LOG */ #if HAS_IGNITE -void -ao_config_ignite_mode_show(void) __reentrant +static void +ao_config_ignite_mode_show(void) { printf("Ignite mode: %d\n", ao_config.ignite_mode); } -void -ao_config_ignite_mode_set(void) __reentrant +static void +ao_config_ignite_mode_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.ignite_mode = ao_cmd_lex_i; + ao_config.ignite_mode = r; _ao_config_edit_finish(); } #endif #if HAS_ACCEL -void -ao_config_pad_orientation_show(void) __reentrant +static void +ao_config_pad_orientation_show(void) { printf("Pad orientation: %d\n", ao_config.pad_orientation); } -#ifndef AO_ACCEL_INVERT -#define AO_ACCEL_INVERT 0x7fff -#endif - -void -ao_config_pad_orientation_set(void) __reentrant +static void +ao_config_pad_orientation_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal() & 1; 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) { - int16_t t; + if (ao_config.pad_orientation != r) { + accel_t t; t = ao_config.accel_plus_g; - ao_config.accel_plus_g = AO_ACCEL_INVERT - ao_config.accel_minus_g; - ao_config.accel_minus_g = AO_ACCEL_INVERT - t; + ao_config.accel_plus_g = ao_data_accel_invert(ao_config.accel_minus_g); + ao_config.accel_minus_g = ao_data_accel_invert(t); } - ao_config.pad_orientation = ao_cmd_lex_i; + ao_config.pad_orientation = r; _ao_config_edit_finish(); } #endif #if HAS_RADIO -void -ao_config_radio_enable_show(void) __reentrant +static void +ao_config_radio_enable_show(void) { printf("Radio enable: %d\n", ao_config.radio_enable); } -void -ao_config_radio_enable_set(void) __reentrant +static void +ao_config_radio_enable_set(void) { - ao_cmd_decimal(); + uint16_t r = 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.radio_enable = r; _ao_config_edit_finish(); #if HAS_TELEMETRY && HAS_RADIO_RATE ao_telemetry_reset_interval(); @@ -697,10 +734,10 @@ ao_config_radio_enable_set(void) __reentrant #if HAS_AES -__xdata uint8_t ao_config_aes_seq = 1; +uint8_t ao_config_aes_seq = 1; -void -ao_config_key_show(void) __reentrant +static void +ao_config_key_show(void) { uint8_t i; printf("AES key: "); @@ -709,17 +746,17 @@ ao_config_key_show(void) __reentrant printf("\n"); } -void -ao_config_key_set(void) __reentrant +static void +ao_config_key_set(void) { uint8_t i; _ao_config_edit_start(); for (i = 0; i < AO_AES_LEN; i++) { - ao_cmd_hexbyte(); + uint8_t b = ao_cmd_hexbyte(); if (ao_cmd_status != ao_cmd_success) break; - ao_config.aes_key[i] = ao_cmd_lex_i; + ao_config.aes_key[i] = b; } ++ao_config_aes_seq; _ao_config_edit_finish(); @@ -728,20 +765,38 @@ ao_config_key_set(void) __reentrant #if HAS_APRS -void +static void ao_config_aprs_show(void) { printf ("APRS interval: %d\n", ao_config.aprs_interval); } -void +static void ao_config_aprs_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); + if (ao_cmd_status != ao_cmd_success) + return; + _ao_config_edit_start(); + ao_config.aprs_interval = r; + _ao_config_edit_finish(); + ao_telemetry_reset_interval(); +} + +static void +ao_config_aprs_offset_show(void) +{ + printf ("APRS offset: %d\n", ao_config.aprs_offset); +} + +static void +ao_config_aprs_offset_set(void) +{ + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.aprs_interval = ao_cmd_lex_i; + ao_config.aprs_offset = r; _ao_config_edit_finish(); ao_telemetry_reset_interval(); } @@ -759,11 +814,11 @@ ao_config_radio_amp_show(void) void ao_config_radio_amp_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.radio_amp = ao_cmd_lex_i; + ao_config.radio_amp = r; _ao_config_edit_finish(); } @@ -780,37 +835,37 @@ ao_config_radio_power_show(void) void ao_config_radio_power_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.radio_power = ao_cmd_lex_i; + ao_config.radio_power = r; _ao_config_edit_finish(); } #endif -#if HAS_BEEP_CONFIG -void +#if HAS_BEEP +static void ao_config_beep_show(void) { printf ("Beeper setting: %d\n", ao_config.mid_beep); } -void +static void ao_config_beep_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.mid_beep = ao_cmd_lex_i; + ao_config.mid_beep = r; _ao_config_edit_finish(); } #endif #if HAS_TRACKER -void +static void ao_config_tracker_show(void) { printf ("Tracker setting: %d %d\n", @@ -818,18 +873,16 @@ ao_config_tracker_show(void) ao_config.tracker_interval); } -void +static void ao_config_tracker_set(void) { uint16_t m, i; - ao_cmd_decimal(); + m = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - m = ao_cmd_lex_i; - ao_cmd_decimal(); + i = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - i = ao_cmd_lex_i; _ao_config_edit_start(); ao_config.tracker_motion = m; ao_config.tracker_interval = i; @@ -841,67 +894,120 @@ ao_config_tracker_set(void) #endif /* HAS_TRACKER */ #if AO_PYRO_NUM -void +static void ao_config_pyro_time_show(void) { printf ("Pyro time: %d\n", ao_config.pyro_time); } -void +static void ao_config_pyro_time_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; _ao_config_edit_start(); - ao_config.pyro_time = ao_cmd_lex_i; + ao_config.pyro_time = r; _ao_config_edit_finish(); } #endif #if HAS_APRS -void +static void ao_config_aprs_ssid_show(void) { printf ("APRS SSID: %d\n", ao_config.aprs_ssid); } -void +static void ao_config_aprs_ssid_set(void) { - ao_cmd_decimal(); + uint16_t r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - if (15 < ao_cmd_lex_i) { + if (15 < r) { ao_cmd_status = ao_cmd_lex_error; return; } _ao_config_edit_start(); - ao_config.aprs_ssid = ao_cmd_lex_i; + ao_config.aprs_ssid = r; + _ao_config_edit_finish(); +} + +static void +ao_config_aprs_format_set(void) +{ + uint16_t r = ao_cmd_decimal(); + if (ao_cmd_status != ao_cmd_success) + return; + _ao_config_edit_start(); + ao_config.aprs_format = r != 0; _ao_config_edit_finish(); } + +static void +ao_config_aprs_format_show(void) +{ + printf ("APRS format: %d\n", ao_config.aprs_format); +} #endif /* HAS_APRS */ +#if HAS_FIXED_PAD_BOX +static void +ao_config_pad_box_show(void) +{ + printf ("Pad box: %d\n", ao_config.pad_box); +} + +static void +ao_config_pad_box_set(void) +{ + uint16_t r = ao_cmd_decimal(); + if (ao_cmd_status != ao_cmd_success) + return; + _ao_config_edit_start(); + ao_config.pad_box = r; + _ao_config_edit_finish(); +} + +static void +ao_config_pad_idle_show(void) +{ + printf ("Idle timeout: %d\n", ao_config.pad_idle); +} + +static void +ao_config_pad_idle_set(void) +{ + uint16_t r = ao_cmd_decimal(); + if (ao_cmd_status != ao_cmd_success) + return; + _ao_config_edit_start(); + ao_config.pad_idle = r; + _ao_config_edit_finish(); +} +#endif + struct ao_config_var { - __code char *str; - void (*set)(void) __reentrant; - void (*show)(void) __reentrant; + const char *str; + void (*set)(void); + void (*show)(void); }; static void -ao_config_help(void) __reentrant; +ao_config_help(void); static void -ao_config_show(void) __reentrant; +ao_config_show(void); -#if HAS_EEPROM +#if HAS_CONFIG_SAVE static void -ao_config_save(void) __reentrant; +ao_config_save(void); #endif -__code struct ao_config_var ao_config_vars[] = { -#if HAS_FLIGHT +const struct ao_config_var ao_config_vars[] = { +#if HAS_FLIGHT && HAS_BARO { "m \0Main deploy (m)", ao_config_main_deploy_set, ao_config_main_deploy_show, }, { "d \0Apogee delay (s)", @@ -946,7 +1052,7 @@ __code struct ao_config_var ao_config_vars[] = { ao_config_log_set, ao_config_log_show }, #endif #if HAS_IGNITE - { "i <0 dual, 1 apogee, 2 main>\0Igniter mode", + { "i <0 dual, 1 apogee, 2 main, 3 booster>\0Igniter mode", ao_config_ignite_mode_set, ao_config_ignite_mode_show }, #endif #if HAS_AES @@ -963,7 +1069,7 @@ __code struct ao_config_var ao_config_vars[] = { { "A \0APRS packet interval (0 disable)", ao_config_aprs_set, ao_config_aprs_show }, #endif -#if HAS_BEEP_CONFIG +#if HAS_BEEP { "b \0Beeper tone (freq = 1/2 (24e6/32) / beep", ao_config_beep_set, ao_config_beep_show }, #endif @@ -974,10 +1080,20 @@ __code struct ao_config_var ao_config_vars[] = { #if HAS_APRS { "S \0Set APRS SSID (0-15)", ao_config_aprs_ssid_set, ao_config_aprs_ssid_show }, + { "C <0 compressed, 1 uncompressed>\0APRS format", + ao_config_aprs_format_set, ao_config_aprs_format_show }, + { "O \0APRS Offset from top of minute", + ao_config_aprs_offset_set, ao_config_aprs_offset_show }, +#endif +#if HAS_FIXED_PAD_BOX + { "B \0Set pad box (1-99)", + ao_config_pad_box_set, ao_config_pad_box_show }, + { "i \0Set idle timeout (0 disable)", + ao_config_pad_idle_set, ao_config_pad_idle_show }, #endif { "s\0Show", ao_config_show, 0 }, -#if HAS_EEPROM +#if HAS_CONFIG_SAVE { "w\0Write to eeprom", ao_config_save, 0 }, #endif @@ -986,7 +1102,7 @@ __code struct ao_config_var ao_config_vars[] = { { 0, 0, 0 } }; -void +static void ao_config_set(void) { char c; @@ -1004,7 +1120,7 @@ ao_config_set(void) } static void -ao_config_help(void) __reentrant +ao_config_help(void) { uint8_t cmd; for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++) @@ -1015,7 +1131,7 @@ ao_config_help(void) __reentrant } static void -ao_config_show(void) __reentrant +ao_config_show(void) { uint8_t cmd; ao_config_get(); @@ -1029,9 +1145,9 @@ ao_config_show(void) __reentrant #endif } -#if HAS_EEPROM +#if HAS_CONFIG_SAVE static void -ao_config_save(void) __reentrant +ao_config_save(void) { uint8_t saved = 0; ao_mutex_get(&ao_config_mutex); @@ -1048,7 +1164,7 @@ ao_config_save(void) __reentrant } #endif -__code struct ao_cmds ao_config_cmds[] = { +const struct ao_cmds ao_config_cmds[] = { { ao_config_set, "c \0Set config (? for help, s to show)" }, { 0, NULL }, };