X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fkernel%2Fao_config.c;h=f7c79e7da0cdbff4cdc9b1b49130eecc5b560ad1;hp=277dddd9fe8b2665e2ec8cce1dfa5d273185e68e;hb=ee7a54b3215ffa1eb38f16a151c0740b14b60857;hpb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830 diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c index 277dddd9..f7c79e7d 100644 --- a/src/kernel/ao_config.c +++ b/src/kernel/ao_config.c @@ -39,6 +39,10 @@ uint8_t ao_config_mutex; 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 #endif @@ -50,7 +54,7 @@ uint8_t ao_force_freq; #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 @@ -75,7 +79,7 @@ uint8_t ao_force_freq; #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) { @@ -120,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 @@ -276,13 +280,15 @@ 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 +static void ao_config_callsign_set(void) { uint8_t c; @@ -306,23 +312,21 @@ ao_config_callsign_set(void) _ao_config_edit_finish(); } -#if HAS_RADIO - -void +static void ao_config_frequency_show(void) { printf("Frequency: %ld\n", ao_config.frequency); } -void +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 @@ -359,26 +363,26 @@ ao_config_send_frequency_set(void) #if HAS_FLIGHT -void +static void ao_config_main_deploy_show(void) { printf("Main deploy: %d meters\n", ao_config.main_deploy); } -void +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(); } #if HAS_ACCEL -void +static void ao_config_accel_calibrate_show(void) { printf("Accel cal +1g: %d -1g: %d\n", @@ -441,20 +445,21 @@ ao_config_accel_calibrate_auto(char *orientation) return accel_total >> ACCEL_CALIBRATE_SHIFT; } -void +static void ao_config_accel_calibrate_set(void) { int16_t up, down; + uint16_t r; #if HAS_GYRO 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(); + r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - if (ao_cmd_lex_i == 0) { + if (r == 0) { up = ao_config_accel_calibrate_auto("up"); #if HAS_GYRO accel_along_up = accel_cal_along; @@ -468,11 +473,11 @@ ao_config_accel_calibrate_set(void) accel_through_down = accel_cal_through; #endif } else { - up = ao_cmd_lex_i; - ao_cmd_decimal(); + up = r; + r = ao_cmd_decimal(); if (ao_cmd_status != ao_cmd_success) return; - down = ao_cmd_lex_i; + down = r; } if (up >= down) { printf("Invalid accel: up (%d) down (%d)\n", @@ -483,7 +488,7 @@ ao_config_accel_calibrate_set(void) ao_config.accel_plus_g = up; ao_config.accel_minus_g = down; #if HAS_GYRO - if (ao_cmd_lex_i == 0) { + if (r == 0) { 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; @@ -493,59 +498,59 @@ ao_config_accel_calibrate_set(void) } #endif /* HAS_ACCEL */ -void +static void ao_config_apogee_delay_show(void) { printf("Apogee delay: %d seconds\n", ao_config.apogee_delay); } -void +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 +static void ao_config_apogee_lockout_show(void) { printf ("Apogee lockout: %d seconds\n", ao_config.apogee_lockout); } -void +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 /* HAS_FLIGHT */ #if HAS_RADIO -void +static void ao_config_radio_cal_show(void) { printf("Radio cal: %ld\n", ao_config.radio_cal); } -void +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(); } @@ -557,24 +562,24 @@ ao_config_radio_cal_set(void) #error Please define HAS_TELEMETRY #endif -void +static void ao_config_radio_rate_show(void) { printf("Telemetry rate: %d\n", ao_config.radio_rate); } -void +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(); @@ -587,7 +592,7 @@ ao_config_radio_rate_set(void) #if HAS_LOG -void +static void ao_config_log_show(void) { printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10)); @@ -596,7 +601,7 @@ ao_config_log_show(void) #endif } -#if FLIGHT_LOG_APPEND +#if FLIGHT_LOG_APPEND && HAS_CONFIG_SAVE void ao_config_log_fix_append(void) { @@ -610,7 +615,7 @@ ao_config_log_fix_append(void) } #endif -void +static void ao_config_log_set(void) { #if FLIGHT_LOG_APPEND @@ -618,19 +623,20 @@ ao_config_log_set(void) #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))) + else if (block > 1024 && (r & (block - 1))) printf("Flight log size must be multiple of %d kB\n", block); - else if (ao_cmd_lex_i > log_max) + else if (r > 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.flight_log_max = r << 10; _ao_config_edit_finish(); } #endif @@ -638,69 +644,64 @@ ao_config_log_set(void) #endif /* HAS_LOG */ #if HAS_IGNITE -void +static void ao_config_ignite_mode_show(void) { printf("Ignite mode: %d\n", ao_config.ignite_mode); } -void +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 +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 +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 +static void ao_config_radio_enable_show(void) { printf("Radio enable: %d\n", ao_config.radio_enable); } -void +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(); @@ -712,7 +713,7 @@ ao_config_radio_enable_set(void) uint8_t ao_config_aes_seq = 1; -void +static void ao_config_key_show(void) { uint8_t i; @@ -722,17 +723,17 @@ ao_config_key_show(void) printf("\n"); } -void +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(); @@ -741,20 +742,20 @@ ao_config_key_set(void) #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 = ao_cmd_lex_i; + ao_config.aprs_interval = r; _ao_config_edit_finish(); ao_telemetry_reset_interval(); } @@ -772,11 +773,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(); } @@ -793,37 +794,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 +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", @@ -831,18 +832,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; @@ -854,59 +853,59 @@ 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(); } -void +static void ao_config_aprs_format_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_format = ao_cmd_lex_i != 0; + ao_config.aprs_format = r != 0; _ao_config_edit_finish(); } -void +static void ao_config_aprs_format_show(void) { printf ("APRS format: %d\n", ao_config.aprs_format); @@ -914,37 +913,37 @@ ao_config_aprs_format_show(void) #endif /* HAS_APRS */ #if HAS_FIXED_PAD_BOX -void +static void ao_config_pad_box_show(void) { printf ("Pad box: %d\n", ao_config.pad_box); } -void +static void ao_config_pad_box_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.pad_box = ao_cmd_lex_i; + ao_config.pad_box = r; _ao_config_edit_finish(); } -void +static void ao_config_pad_idle_show(void) { printf ("Idle timeout: %d\n", ao_config.pad_idle); } -void +static void ao_config_pad_idle_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.pad_idle = ao_cmd_lex_i; + ao_config.pad_idle = r; _ao_config_edit_finish(); } #endif @@ -961,7 +960,7 @@ ao_config_help(void); static void ao_config_show(void); -#if HAS_EEPROM +#if HAS_CONFIG_SAVE static void ao_config_save(void); #endif @@ -1051,7 +1050,7 @@ const struct ao_config_var ao_config_vars[] = { #endif { "s\0Show", ao_config_show, 0 }, -#if HAS_EEPROM +#if HAS_CONFIG_SAVE { "w\0Write to eeprom", ao_config_save, 0 }, #endif @@ -1060,7 +1059,7 @@ const struct ao_config_var ao_config_vars[] = { { 0, 0, 0 } }; -void +static void ao_config_set(void) { char c; @@ -1103,7 +1102,7 @@ ao_config_show(void) #endif } -#if HAS_EEPROM +#if HAS_CONFIG_SAVE static void ao_config_save(void) {