telefireone-v1.0: Use a boolean value for ao_log_running

[fw/altos] / src / kernel / ao_config.c

diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index bfc0325e00d9406c59c51cc2d7fd9a23c8682310..52d25aec0b226aca40d6a281f3ef9415b91185c2 100644 (file)
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -76,7 +76,7 @@ uint8_t ao_force_freq;
 #define AO_CONFIG_DEFAULT_RADIO_POWER          0x60
 #endif
 #define AO_CONFIG_DEFAULT_RADIO_AMP            0
-#define AO_CONFIG_DEFAULT_APRS_SSID            (ao_serial_number % 10)
+#define AO_CONFIG_DEFAULT_APRS_SSID            ((uint8_t) (ao_serial_number % 10))
 #define AO_CONFIG_DEFAULT_RADIO_RATE           AO_RADIO_RATE_38400
 
 #if HAS_CONFIG_SAVE
@@ -145,6 +145,9 @@ _ao_config_get(void)
        }
        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;
@@ -173,7 +176,7 @@ _ao_config_get(void)
                if (minor < 9)
                        memset(&ao_config.aes_key, '\0', AO_AES_LEN);
                if (minor < 10)
-                       ao_config.frequency = 434550 + ao_config._legacy_radio_channel * 100;
+                       ao_config.frequency = 434550U + ao_config._legacy_radio_channel * 100U;
                if (minor < 11)
                        ao_config.apogee_lockout = 0;
 #if AO_PYRO_NUM
@@ -203,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
@@ -383,7 +386,7 @@ ao_config_main_deploy_set(void)
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.main_deploy = r;
+       ao_config.main_deploy = (uint16_t) r;
        _ao_config_edit_finish();
 }
 
@@ -446,11 +449,11 @@ ao_config_accel_calibrate_auto(char *orientation)
                }
        }
 #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;
+       accel_cal_along = (int16_t) (accel_along_total >> ACCEL_CALIBRATE_SHIFT);
+       accel_cal_across = (int16_t) (accel_across_total >> ACCEL_CALIBRATE_SHIFT);
+       accel_cal_through = (int16_t) (accel_through_total >> ACCEL_CALIBRATE_SHIFT);
 #endif
-       return accel_total >> ACCEL_CALIBRATE_SHIFT;
+       return (int16_t) (accel_total >> ACCEL_CALIBRATE_SHIFT);
 }
 
 static void
@@ -464,10 +467,10 @@ ao_config_accel_calibrate_set(void)
        int16_t accel_through_up = 0, accel_through_down = 0;
 #endif
 
-       up = ao_cmd_decimal();
+       up = (int16_t) ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       down = ao_cmd_decimal();
+       down = (int16_t) ao_cmd_decimal();
        auto_cal = (up == 0 && ao_cmd_status != ao_cmd_success);
        if (auto_cal) {
                up = ao_config_accel_calibrate_auto("up");
@@ -493,19 +496,19 @@ ao_config_accel_calibrate_set(void)
        ao_config.accel_minus_g = down;
 #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;
+               ao_config.accel_zero_along = (int16_t) ((accel_along_up + accel_along_down) / 2);
+               ao_config.accel_zero_across = (int16_t) ((accel_across_up + accel_across_down) / 2);
+               ao_config.accel_zero_through = (int16_t) ((accel_through_up + accel_through_down) / 2);
        } else {
                int16_t v;
 
-               v = ao_cmd_decimal();
+               v = (int16_t) ao_cmd_decimal();
                if (ao_cmd_status == ao_cmd_success) {
                        ao_config.accel_zero_along = v;
-                       v = ao_cmd_decimal();
+                       v = (int16_t) ao_cmd_decimal();
                        if (ao_cmd_status == ao_cmd_success) {
                                ao_config.accel_zero_across = v;
-                               v = ao_cmd_decimal();
+                               v = (int16_t) ao_cmd_decimal();
                                if (ao_cmd_status == ao_cmd_success)
                                        ao_config.accel_zero_through = v;
                        }
@@ -530,8 +533,12 @@ ao_config_apogee_delay_set(void)
        uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
+       if (r > 255) {
+               ao_cmd_status = ao_cmd_lex_error;
+               return;
+       }
        _ao_config_edit_start();
-       ao_config.apogee_delay = r;
+       ao_config.apogee_delay = (uint8_t) r;
        _ao_config_edit_finish();
 }
 
@@ -545,11 +552,15 @@ ao_config_apogee_lockout_show(void)
 static void
 ao_config_apogee_lockout_set(void) 
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
+       if (r > 65535) {
+               ao_cmd_status = ao_cmd_lex_error;
+               return;
+       }
        _ao_config_edit_start();
-       ao_config.apogee_lockout = r;
+       ao_config.apogee_lockout = (uint16_t) r;
        _ao_config_edit_finish();
 }
 #endif
@@ -591,7 +602,7 @@ ao_config_radio_rate_show(void)
 static void
 ao_config_radio_rate_set(void) 
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        if (AO_RADIO_RATE_MAX < r) {
@@ -599,7 +610,7 @@ ao_config_radio_rate_set(void)
                return;
        }
        _ao_config_edit_start();
-       ao_config.radio_rate = r;
+       ao_config.radio_rate = (uint8_t) r;
        _ao_config_edit_finish();
 #if HAS_TELEMETRY
        ao_telemetry_reset_interval();
@@ -673,11 +684,11 @@ ao_config_ignite_mode_show(void)
 static void
 ao_config_ignite_mode_set(void) 
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.ignite_mode = r;
+       ao_config.ignite_mode = (uint8_t) r;
        _ao_config_edit_finish();
 }
 #endif
@@ -692,7 +703,7 @@ ao_config_pad_orientation_show(void)
 static void
 ao_config_pad_orientation_set(void) 
 {
-       uint16_t r = ao_cmd_decimal() & 1;
+       uint8_t r = ao_cmd_decimal() & 1;
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
@@ -717,11 +728,11 @@ ao_config_radio_enable_show(void)
 static void
 ao_config_radio_enable_set(void) 
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.radio_enable = r;
+       ao_config.radio_enable = r != 0;
        _ao_config_edit_finish();
 #if HAS_TELEMETRY && HAS_RADIO_RATE
        ao_telemetry_reset_interval();
@@ -771,11 +782,11 @@ ao_config_aprs_show(void)
 static void
 ao_config_aprs_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.aprs_interval = r;
+       ao_config.aprs_interval = (uint16_t) r;
        _ao_config_edit_finish();
        ao_telemetry_reset_interval();
 }
@@ -789,11 +800,11 @@ ao_config_aprs_offset_show(void)
 static void
 ao_config_aprs_offset_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.aprs_offset = r;
+       ao_config.aprs_offset = (uint8_t) r;
        _ao_config_edit_finish();
        ao_telemetry_reset_interval();
 }
@@ -842,7 +853,7 @@ ao_config_radio_power_set(void)
 
 #endif
 
-#if HAS_BEEP_CONFIG
+#if HAS_BEEP
 static void
 ao_config_beep_show(void)
 {
@@ -852,11 +863,11 @@ ao_config_beep_show(void)
 static void
 ao_config_beep_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.mid_beep = r;
+       ao_config.mid_beep = (uint8_t) r;
        _ao_config_edit_finish();
 }
 #endif
@@ -873,11 +884,12 @@ ao_config_tracker_show(void)
 static void
 ao_config_tracker_set(void)
 {
-       uint16_t        m, i;
-       m = ao_cmd_decimal();
+       uint16_t        m;
+       uint8_t         i;
+       m = (uint16_t) ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
-       i = ao_cmd_decimal();
+       i = (uint8_t) ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
@@ -900,11 +912,11 @@ ao_config_pyro_time_show(void)
 static void
 ao_config_pyro_time_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.pyro_time = r;
+       ao_config.pyro_time = (uint16_t) r;
        _ao_config_edit_finish();
 }
 #endif
@@ -920,7 +932,7 @@ ao_config_aprs_ssid_show(void)
 static void
 ao_config_aprs_ssid_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        if (15 < r) {
@@ -928,14 +940,14 @@ ao_config_aprs_ssid_set(void)
                return;
        }
        _ao_config_edit_start();
-       ao_config.aprs_ssid = r;
+       ao_config.aprs_ssid = (uint8_t) r;
        _ao_config_edit_finish();
 }
 
 static void
 ao_config_aprs_format_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
@@ -960,11 +972,11 @@ ao_config_pad_box_show(void)
 static void
 ao_config_pad_box_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.pad_box = r;
+       ao_config.pad_box = (uint8_t) r;
        _ao_config_edit_finish();
 }
 
@@ -977,11 +989,11 @@ ao_config_pad_idle_show(void)
 static void
 ao_config_pad_idle_set(void)
 {
-       uint16_t r = ao_cmd_decimal();
+       uint32_t r = ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
                return;
        _ao_config_edit_start();
-       ao_config.pad_idle = r;
+       ao_config.pad_idle = (uint8_t) r;
        _ao_config_edit_finish();
 }
 #endif
@@ -1066,7 +1078,7 @@ const struct ao_config_var ao_config_vars[] = {
        { "A <secs>\0APRS packet interval (0 disable)",
          ao_config_aprs_set, ao_config_aprs_show },
 #endif
-#if HAS_BEEP_CONFIG
+#if HAS_BEEP
        { "b <val>\0Beeper tone (freq = 1/2 (24e6/32) / beep",
          ao_config_beep_set, ao_config_beep_show },
 #endif