Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Merge pull request #11192 from jeffpearce/elrsguid

Browse source 
Add support for getting/setting elrs uid via msp API
This commit is contained in:
haslinghuis 2022-10-27 02:08:12 +02:00 • committed by GitHub
commit 7bba781f58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/msp/msp.c
View file

@ -124,6 +124,9 @@
#include "pg/motor.h" #include "pg/motor.h"
#include "pg/rx.h" #include "pg/rx.h"
#include "pg/rx_spi.h" #include "pg/rx_spi.h"
#ifdef USE_RX_EXPRESSLRS
#include "pg/rx_spi_expresslrs.h"
#endif
#include "pg/usb.h" #include "pg/usb.h"
#include "pg/vcd.h" #include "pg/vcd.h"
#include "pg/vtx_table.h" #include "pg/vtx_table.h"
@ -1614,6 +1617,15 @@ static bool mspProcessOutCommand(mspDescriptor_t srcDesc, int16_t cmdMSP, sbuf_t
#else #else
sbufWriteU8(dst, 0); sbufWriteU8(dst, 0);
#endif #endif
// Added in MSP API 1.45
#ifdef USE_RX_EXPRESSLRS
sbufWriteData(dst, rxExpressLrsSpiConfig()->UID, sizeof(rxExpressLrsSpiConfig()->UID));
#else
uint8_t emptyUid[6];
memset(emptyUid, 0, sizeof(emptyUid));
sbufWriteData(dst, &emptyUid, sizeof(emptyUid));
#endif
break; break;
case MSP_FAILSAFE_CONFIG: case MSP_FAILSAFE_CONFIG:
sbufWriteU8(dst, failsafeConfig()->failsafe_delay); sbufWriteU8(dst, failsafeConfig()->failsafe_delay);
@ -3621,6 +3633,15 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, int16_t cmdMSP,
#else #else
sbufReadU8(src); sbufReadU8(src);
#endif #endif
}
if (sbufBytesRemaining(src) >= 6) {
// Added in MSP API 1.45
#ifdef USE_RX_EXPRESSLRS
sbufReadData(src, rxExpressLrsSpiConfigMutable()->UID, 6);
#else
uint8_t emptyUid[6];
sbufReadData(src, emptyUid, 6);
#endif
} }
break; break;
case MSP_SET_FAILSAFE_CONFIG: case MSP_SET_FAILSAFE_CONFIG: