From ff68f0da0ddf5c6134e4410fa0bcc0187fd31037 Mon Sep 17 00:00:00 2001 From: Bas Delfos Date: Wed, 31 Jan 2018 23:12:08 +0100 Subject: [PATCH 1/2] Added DSHOT beacon config to MSP_(SET_)BEEPER --- src/main/interface/msp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c index b8827dcca1..b4b0313176 100644 --- a/src/main/interface/msp.c +++ b/src/main/interface/msp.c @@ -40,6 +40,7 @@ #include "config/feature.h" #include "pg/pg.h" #include "pg/pg_ids.h" +#include "pg/beeper.h" #include "drivers/accgyro/accgyro.h" #include "drivers/bus_i2c.h" @@ -473,6 +474,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce #ifdef BEEPER case MSP_BEEPER_CONFIG: sbufWriteU32(dst, getBeeperOffMask()); + sbufWriteU8(dst, beeperConfig()->dshotBeaconTone); break; #endif @@ -1839,6 +1841,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src) case MSP_SET_BEEPER_CONFIG: beeperOffClearAll(); setBeeperOffMask(sbufReadU32(src)); + beeperConfigMutable()->dshotBeaconTone = sbufReadU8(src); break; #endif From 40b6bda25ebb637cc7f93208233338fb15075ff5 Mon Sep 17 00:00:00 2001 From: Bas Delfos Date: Wed, 31 Jan 2018 23:29:26 +0100 Subject: [PATCH 2/2] Added remaining bytes check --- src/main/interface/msp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c index b4b0313176..8cbc82a8f5 100644 --- a/src/main/interface/msp.c +++ b/src/main/interface/msp.c @@ -1841,7 +1841,9 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src) case MSP_SET_BEEPER_CONFIG: beeperOffClearAll(); setBeeperOffMask(sbufReadU32(src)); - beeperConfigMutable()->dshotBeaconTone = sbufReadU8(src); + if (sbufBytesRemaining(src) >= 1) { + beeperConfigMutable()->dshotBeaconTone = sbufReadU8(src); + } break; #endif