altoslib: Missed a couple of easy mini voltage API changes

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

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 82faf32bbb904b22517fb814f86d829f30231d3f..4482f673f59c0fdbbe132f0c52bcd89d1095a762 100644 (file)
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -17,7 +17,7 @@
 
 #include "ao.h"
 #include "ao_log.h"
-#include <ao_storage.h>
+#include <ao_config.h>
 #if HAS_FLIGHT
 #include <ao_sample.h>
 #include <ao_data.h>
@@ -59,13 +59,13 @@ __xdata uint8_t ao_config_mutex;
 static void
 _ao_config_put(void)
 {
-       ao_storage_setup();
-       ao_storage_erase(ao_storage_config);
-       ao_storage_write(ao_storage_config, &ao_config, sizeof (ao_config));
+       ao_config_setup();
+       ao_config_erase();
+       ao_config_write(0, &ao_config, sizeof (ao_config));
 #if HAS_FLIGHT
        ao_log_write_erase(0);
 #endif
-       ao_storage_flush();
+       ao_config_flush();
 }
 
 void
@@ -97,8 +97,8 @@ _ao_config_get(void)
         * but ao_storage_setup *also* sets ao_storage_config, which we
         * need before calling ao_storage_read here
         */
-       ao_storage_setup();
-       ao_storage_read(ao_storage_config, &ao_config, sizeof (ao_config));
+       ao_config_setup();
+       ao_config_read(0, &ao_config, sizeof (ao_config));
 #endif
        if (ao_config.major != AO_CONFIG_MAJOR) {
                ao_config.major = AO_CONFIG_MAJOR;
@@ -127,8 +127,10 @@ _ao_config_get(void)
                        ao_config.radio_cal = ao_radio_cal;
 #endif
                /* Fixups for minor version 4 */
+#if HAS_FLIGHT
                if (minor < 4)
                        ao_config.flight_log_max = AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX;
+#endif
                /* Fixupes for minor version 5 */
                if (minor < 5)
                        ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
@@ -351,9 +353,9 @@ ao_config_accel_calibrate_set(void) __reentrant
 {
        int16_t up, down;
 #if HAS_GYRO
-       int16_t accel_along_up, accel_along_down;
-       int16_t accel_across_up, accel_across_down;
-       int16_t accel_through_up, accel_through_down;
+       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();
@@ -388,9 +390,11 @@ ao_config_accel_calibrate_set(void) __reentrant
        ao_config.accel_plus_g = up;
        ao_config.accel_minus_g = down;
 #if HAS_GYRO
-       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;
+       if (ao_cmd_lex_i == 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;
+       }
 #endif
        _ao_config_edit_finish();
 }
@@ -465,7 +469,7 @@ void
 ao_config_log_set(void) __reentrant
 {
        uint16_t        block = (uint16_t) (ao_storage_block >> 10);
-       uint16_t        config = (uint16_t) (ao_storage_config >> 10);
+       uint16_t        log_max = (uint16_t) (ao_storage_log_max >> 10);
 
        ao_cmd_decimal();
        if (ao_cmd_status != ao_cmd_success)
@@ -474,8 +478,8 @@ ao_config_log_set(void) __reentrant
                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 > config)
-               printf("Flight log max %d kB\n", config);
+       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;
@@ -510,6 +514,10 @@ ao_config_pad_orientation_show(void) __reentrant
        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
 {
@@ -519,10 +527,10 @@ ao_config_pad_orientation_set(void) __reentrant
        _ao_config_edit_start();
        ao_cmd_lex_i &= 1;
        if (ao_config.pad_orientation != ao_cmd_lex_i) {
-               uint16_t t;
+               int16_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.accel_plus_g = AO_ACCEL_INVERT - ao_config.accel_minus_g;
+               ao_config.accel_minus_g = AO_ACCEL_INVERT - t;
        }
        ao_config.pad_orientation = ao_cmd_lex_i;
        _ao_config_edit_finish();
@@ -654,8 +662,10 @@ ao_config_help(void) __reentrant;
 static void
 ao_config_show(void) __reentrant;
 
+#if HAS_EEPROM
 static void
-ao_config_write(void) __reentrant;
+ao_config_save(void) __reentrant;
+#endif
 
 __code struct ao_config_var ao_config_vars[] = {
 #if HAS_FLIGHT
@@ -714,7 +724,7 @@ __code struct ao_config_var ao_config_vars[] = {
          ao_config_show,               0 },
 #if HAS_EEPROM
        { "w\0Write to eeprom",
-         ao_config_write,              0 },
+         ao_config_save,               0 },
 #endif
        { "?\0Help",
          ao_config_help,               0 },
@@ -766,7 +776,7 @@ ao_config_show(void) __reentrant
 
 #if HAS_EEPROM
 static void
-ao_config_write(void) __reentrant
+ao_config_save(void) __reentrant
 {
        uint8_t saved = 0;
        ao_mutex_get(&ao_config_mutex);