Browse Source

Plane: make LOG_BITMASK 32 bits

mission-4.1.18
Andrew Tridgell 11 years ago
parent
commit
874110b29d
  1. 4
      ArduPlane/Log.pde
  2. 5
      ArduPlane/Parameters.h
  3. 1
      ArduPlane/Parameters.pde

4
ArduPlane/Log.pde

@ -112,7 +112,7 @@ erase_logs(uint8_t argc, const Menu::arg *argv) @@ -112,7 +112,7 @@ erase_logs(uint8_t argc, const Menu::arg *argv)
static int8_t
select_logs(uint8_t argc, const Menu::arg *argv)
{
uint16_t bits;
uint32_t bits;
if (argc != 2) {
cliSerial->printf_P(PSTR("missing log type\n"));
@ -128,7 +128,7 @@ select_logs(uint8_t argc, const Menu::arg *argv) @@ -128,7 +128,7 @@ select_logs(uint8_t argc, const Menu::arg *argv)
// bits accordingly.
//
if (!strcasecmp_P(argv[1].str, PSTR("all"))) {
bits = ~0;
bits = 0xFFFFFFFFUL;
} else {
#define TARG(_s) if (!strcasecmp_P(argv[1].str, PSTR(# _s))) bits |= MASK_LOG_ ## _s
TARG(ATTITUDE_FAST);

5
ArduPlane/Parameters.h

@ -55,7 +55,7 @@ public: @@ -55,7 +55,7 @@ public:
// Misc
//
k_param_auto_trim = 10,
k_param_log_bitmask,
k_param_log_bitmask_old, // unused
k_param_pitch_trim_cd,
k_param_mix_mode,
k_param_reverse_elevons,
@ -99,6 +99,7 @@ public: @@ -99,6 +99,7 @@ public:
k_param_rally_limit_km,
k_param_hil_err_limit,
k_param_sonar,
k_param_log_bitmask,
// 100: Arming parameters
k_param_arming = 100,
@ -388,7 +389,7 @@ public: @@ -388,7 +389,7 @@ public:
AP_Int8 reverse_ch1_elevon;
AP_Int8 reverse_ch2_elevon;
AP_Int16 num_resets;
AP_Int16 log_bitmask;
AP_Int32 log_bitmask;
AP_Int8 reset_switch_chan;
AP_Int8 reset_mission_chan;
AP_Int32 airspeed_cruise_cm;

1
ArduPlane/Parameters.pde

@ -982,6 +982,7 @@ const AP_Param::ConversionInfo conversion_table[] PROGMEM = { @@ -982,6 +982,7 @@ const AP_Param::ConversionInfo conversion_table[] PROGMEM = {
{ Parameters::k_param_curr_amp_per_volt, 0, AP_PARAM_FLOAT, "BATT_AMP_PERVOLT" },
{ Parameters::k_param_curr_amp_offset, 0, AP_PARAM_FLOAT, "BATT_AMP_OFFSET" },
{ Parameters::k_param_pack_capacity, 0, AP_PARAM_INT32, "BATT_CAPACITY" },
{ Parameters::k_param_log_bitmask_old, 0, AP_PARAM_INT16, "LOG_BITMASK" },
};
static void load_parameters(void)

Loading…
Cancel
Save