From 2188ee4be2d5cef471e6e09c5d0d29f43fc4ce1c Mon Sep 17 00:00:00 2001 From: Gary Keeble Date: Wed, 1 Jun 2016 13:50:18 +0100 Subject: [PATCH] Updated Blackbox 'case' numbers Case numbers need to be consecutive for the header. --- src/main/blackbox/blackbox.c | 66 ++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index bf43dcc35..ebda24dca 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -1195,142 +1195,142 @@ static bool blackboxWriteSysinfo() case 18: blackboxPrintfHeaderLine("tpa_breakpoint:%d", masterConfig.profile[masterConfig.current_profile_index].controlRateProfile[masterConfig.profile[masterConfig.current_profile_index].activeRateProfile].tpa_breakpoint); break; - case 21: + case 19: blackboxPrintfHeaderLine("rates:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].controlRateProfile[masterConfig.profile[masterConfig.current_profile_index].activeRateProfile].rates[ROLL], masterConfig.profile[masterConfig.current_profile_index].controlRateProfile[masterConfig.profile[masterConfig.current_profile_index].activeRateProfile].rates[PITCH], masterConfig.profile[masterConfig.current_profile_index].controlRateProfile[masterConfig.profile[masterConfig.current_profile_index].activeRateProfile].rates[YAW]); break; - case 22: + case 20: blackboxPrintfHeaderLine("looptime:%d", targetLooptime); break; - case 23: + case 21: blackboxPrintfHeaderLine("pidController:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.pidController); break; - case 24: + case 22: blackboxPrintfHeaderLine("rollPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[ROLL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[ROLL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[ROLL]); break; - case 25: + case 23: blackboxPrintfHeaderLine("pitchPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PITCH], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PITCH], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PITCH]); break; - case 26: + case 24: blackboxPrintfHeaderLine("yawPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[YAW], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[YAW], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[YAW]); break; - case 27: + case 25: blackboxPrintfHeaderLine("altPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDALT], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDALT], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDALT]); break; - case 28: + case 26: blackboxPrintfHeaderLine("posPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDPOS], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDPOS], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDPOS]); break; - case 29: + case 27: blackboxPrintfHeaderLine("posrPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDPOSR], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDPOSR], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDPOSR]); break; - case 30: + case 28: blackboxPrintfHeaderLine("navrPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDNAVR], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDNAVR], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDNAVR]); break; - case 31: + case 29: blackboxPrintfHeaderLine("levelPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDLEVEL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDLEVEL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDLEVEL]); break; - case 32: + case 30: blackboxPrintfHeaderLine("magPID:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDMAG]); break; - case 33: + case 31: blackboxPrintfHeaderLine("velPID:%d,%d,%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.P8[PIDVEL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.I8[PIDVEL], masterConfig.profile[masterConfig.current_profile_index].pidProfile.D8[PIDVEL]); break; - case 34: + case 32: blackboxPrintfHeaderLine("yaw_p_limit:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.yaw_p_limit); break; - case 35: + case 33: blackboxPrintfHeaderLine("yaw_lpf_hz:%d", (int)(masterConfig.profile[masterConfig.current_profile_index].pidProfile.yaw_lpf_hz * 100.0f)); break; - case 36: + case 34: blackboxPrintfHeaderLine("dterm_average_count:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.dterm_average_count); break; - case 37: + case 35: blackboxPrintfHeaderLine("dynamic_pid:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.dynamic_pid); break; - case 38: + case 36: blackboxPrintfHeaderLine("rollPitchItermResetRate:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.rollPitchItermIgnoreRate); break; - case 39: + case 37: blackboxPrintfHeaderLine("yawItermResetRate:%d", masterConfig.profile[masterConfig.current_profile_index].pidProfile.yawItermIgnoreRate); break; - case 40: + case 38: blackboxPrintfHeaderLine("dterm_lpf_hz:%d", (int)(masterConfig.profile[masterConfig.current_profile_index].pidProfile.dterm_lpf_hz * 100.0f)); break; - case 41: + case 39: blackboxPrintfHeaderLine("airmode_activate_throttle:%d", masterConfig.rxConfig.airModeActivateThreshold); break; - case 42: + case 40: blackboxPrintfHeaderLine("deadband:%d", masterConfig.rcControlsConfig.deadband); break; - case 43: + case 41: blackboxPrintfHeaderLine("yaw_deadband:%d", masterConfig.rcControlsConfig.yaw_deadband); break; - case 44: + case 42: blackboxPrintfHeaderLine("gyro_lpf:%d", masterConfig.gyro_lpf); break; - case 45: + case 43: blackboxPrintfHeaderLine("gyro_lowpass_hz:%d", (int)(masterConfig.gyro_soft_lpf_hz * 100.0f)); break; - case 46: + case 44: blackboxPrintfHeaderLine("acc_lpf_hz:%d", (int)(masterConfig.acc_lpf_hz * 100.0f)); break; - case 47: + case 45: blackboxPrintfHeaderLine("acc_hardware:%d", masterConfig.acc_hardware); break; - case 48: + case 46: blackboxPrintfHeaderLine("baro_hardware:%d", masterConfig.baro_hardware); break; - case 49: + case 47: blackboxPrintfHeaderLine("mag_hardware:%d", masterConfig.mag_hardware); break; - case 50: + case 48: blackboxPrintfHeaderLine("gyro_cal_on_first_arm:%d", masterConfig.gyro_cal_on_first_arm); break; - case 51: + case 49: blackboxPrintfHeaderLine("vbat_pid_compensation:%d", masterConfig.batteryConfig.vbatPidCompensation); break; - case 52: + case 50: blackboxPrintfHeaderLine("rc_smoothing:%d", masterConfig.rxConfig.rcSmoothing); break; - case 53: + case 51: blackboxPrintfHeaderLine("features:%d", masterConfig.enabledFeatures); break; default: