1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00

ifdef condition consistently applied, field names consistent, pg ID updated

This commit is contained in:
ctzsnooze 2021-08-30 09:33:12 +10:00
parent 28d9d778a6
commit 5863015354
12 changed files with 46 additions and 32 deletions

View file

@ -1822,7 +1822,11 @@ static bool mspProcessOutCommand(int16_t cmdMSP, sbuf_t *dst)
sbufWriteU16(dst, 0); // was pidProfile.yaw_p_limit
sbufWriteU8(dst, 0); // reserved
sbufWriteU8(dst, 0); // was vbatPidCompensation
sbufWriteU8(dst, currentPidProfile->feedforwardTransition);
#if defined(USE_FEEDFORWARD)
sbufWriteU8(dst, currentPidProfile->feedforward_transition);
#else
sbufWriteU8(dst, 0);
#endif
sbufWriteU8(dst, 0); // was low byte of currentPidProfile->dtermSetpointWeight
sbufWriteU8(dst, 0); // reserved
sbufWriteU8(dst, 0); // reserved
@ -1901,11 +1905,12 @@ static bool mspProcessOutCommand(int16_t cmdMSP, sbuf_t *dst)
#if defined(USE_FEEDFORWARD)
sbufWriteU8(dst, currentPidProfile->feedforward_averaging);
sbufWriteU8(dst, currentPidProfile->feedforward_smooth_factor);
sbufWriteU8(dst, currentPidProfile->feedforward_boost);
#else
sbufWriteU8(dst, 0);
sbufWriteU8(dst, 0);
sbufWriteU8(dst, 0);
#endif
sbufWriteU8(dst, currentPidProfile->feedforward_boost);
#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
sbufWriteU8(dst, currentPidProfile->vbat_sag_compensation);
#else
@ -2707,7 +2712,11 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, int16_t cmdMSP,
sbufReadU16(src); // was pidProfile.yaw_p_limit
sbufReadU8(src); // reserved
sbufReadU8(src); // was vbatPidCompensation
currentPidProfile->feedforwardTransition = sbufReadU8(src);
#if defined(USE_FEEDFORWARD)
currentPidProfile->feedforward_transition = sbufReadU8(src);
#else
sbufReadU8(src);
#endif
sbufReadU8(src); // was low byte of currentPidProfile->dtermSetpointWeight
sbufReadU8(src); // reserved
sbufReadU8(src); // reserved
@ -2804,11 +2813,13 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, int16_t cmdMSP,
#if defined(USE_FEEDFORWARD)
currentPidProfile->feedforward_averaging = sbufReadU8(src);
currentPidProfile->feedforward_smooth_factor = sbufReadU8(src);
currentPidProfile->feedforward_boost = sbufReadU8(src);
#else
sbufReadU8(src);
sbufReadU8(src);
sbufReadU8(src);
#endif
currentPidProfile->feedforward_boost = sbufReadU8(src);
#if defined(USE_BATTERY_VOLTAGE_SAG_COMPENSATION)
currentPidProfile->vbat_sag_compensation = sbufReadU8(src);
#else