From 815677d33bdb0ec7b18714a1e1c489a7f5cb816f Mon Sep 17 00:00:00 2001 From: Airwide Date: Wed, 9 Sep 2020 16:52:52 +0200 Subject: [PATCH 1/2] Added tz_automatic_dst to MSP2_COMMON_TZ and MSP2_COMMON_SET_TZ --- src/main/fc/fc_msp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index a5586aa3b62..c97936daa3f 100644 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -1404,6 +1404,7 @@ static bool mspFcProcessOutCommand(uint16_t cmdMSP, sbuf_t *dst, mspPostProcessF case MSP2_COMMON_TZ: sbufWriteU16(dst, (uint16_t)timeConfig()->tz_offset); + sbufWriteU8(dst, (uint8_t)timeConfig()->tz_automatic_dst); break; case MSP2_INAV_AIR_SPEED: @@ -2724,9 +2725,10 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src) break; case MSP2_COMMON_SET_TZ: - if (dataSize == 2) + if (dataSize == 3) { timeConfigMutable()->tz_offset = (int16_t)sbufReadU16(src); - else + timeConfigMutable()->tz_automatic_dst = (uint8_t)sbufReadU8(src); + } else return MSP_RESULT_ERROR; break; From ffeed26955ddd428d59763da7283bac180624e7a Mon Sep 17 00:00:00 2001 From: Airwide Date: Wed, 9 Sep 2020 17:35:46 +0200 Subject: [PATCH 2/2] Added logic to handle 2 vs 3 bytes in MSP2_COMMON_SET_TZ --- src/main/fc/fc_msp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index c97936daa3f..16999bd0579 100644 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -2725,7 +2725,9 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src) break; case MSP2_COMMON_SET_TZ: - if (dataSize == 3) { + if (dataSize == 2) + timeConfigMutable()->tz_offset = (int16_t)sbufReadU16(src); + else if (dataSize == 3) { timeConfigMutable()->tz_offset = (int16_t)sbufReadU16(src); timeConfigMutable()->tz_automatic_dst = (uint8_t)sbufReadU8(src); } else