From 3b8d37e96d911fc6be8b89ee299b55283d36c433 Mon Sep 17 00:00:00 2001 From: kaweksl Date: Fri, 11 Oct 2019 10:56:39 +0200 Subject: [PATCH 1/2] MSP Add allowArmingWithoutFix fixed compatibility and comments --- src/main/msp/msp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c index ef046d91bf..f610ed6cc0 100644 --- a/src/main/msp/msp.c +++ b/src/main/msp/msp.c @@ -1297,6 +1297,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst) // Added in API version 1.43 sbufWriteU16(dst, gpsRescueConfig()->ascendRate); sbufWriteU16(dst, gpsRescueConfig()->descendRate); + sbufWriteU8(dst, gpsRescueConfig()->allowArmingWithoutFix); break; case MSP_GPS_RESCUE_PIDS: @@ -2196,6 +2197,9 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, uint8_t cmdMSP, // Added in API version 1.43 gpsRescueConfigMutable()->ascendRate = sbufReadU16(src); gpsRescueConfigMutable()->descendRate = sbufReadU16(src); + if (sbufBytesRemaining(src) >= 1) { + // Added in API version 1.43 + gpsRescueConfigMutable()->allowArmingWithoutFix = sbufReadU8(src); } break; From 861d38a83f56fe846e192b0c965640701266754b Mon Sep 17 00:00:00 2001 From: kaweksl Date: Mon, 21 Oct 2019 13:08:11 +0200 Subject: [PATCH 2/2] combining buffer check --- src/main/msp/msp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c index f610ed6cc0..f761bb3c9a 100644 --- a/src/main/msp/msp.c +++ b/src/main/msp/msp.c @@ -1297,7 +1297,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst) // Added in API version 1.43 sbufWriteU16(dst, gpsRescueConfig()->ascendRate); sbufWriteU16(dst, gpsRescueConfig()->descendRate); - sbufWriteU8(dst, gpsRescueConfig()->allowArmingWithoutFix); + sbufWriteU8(dst, gpsRescueConfig()->allowArmingWithoutFix); break; case MSP_GPS_RESCUE_PIDS: @@ -2193,12 +2193,10 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, uint8_t cmdMSP, gpsRescueConfigMutable()->throttleHover = sbufReadU16(src); gpsRescueConfigMutable()->sanityChecks = sbufReadU8(src); gpsRescueConfigMutable()->minSats = sbufReadU8(src); - if (sbufBytesRemaining(src) >= 4) { + if (sbufBytesRemaining(src) >= 5) { // Added in API version 1.43 gpsRescueConfigMutable()->ascendRate = sbufReadU16(src); gpsRescueConfigMutable()->descendRate = sbufReadU16(src); - if (sbufBytesRemaining(src) >= 1) { - // Added in API version 1.43 gpsRescueConfigMutable()->allowArmingWithoutFix = sbufReadU8(src); } break;