Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Update ledstrip MSP to add support for advanced flag and profile

Browse source 
Added a flag indicating the level of ledstrip support (to allow improved Configurator behavior) along with support for reading/setting the current `ledstrip_profile`.

ledstrip support flag is as follows:
0 = basic ledstrip available
1 = advanced ledstrip available
This commit is contained in:
Bruce Luckcuck 2019-01-28 07:40:55 -05:00
parent 436892424c
commit d8c54460a9
1 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1195,14 +1195,32 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
sbufWriteU8(dst, color->v); sbufWriteU8(dst, color->v);
} }
break; break;
#endif
#ifdef USE_LED_STRIP
case MSP_LED_STRIP_CONFIG: case MSP_LED_STRIP_CONFIG:
for (int i = 0; i < LED_MAX_STRIP_LENGTH; i++) { for (int i = 0; i < LED_MAX_STRIP_LENGTH; i++) {
#ifdef USE_LED_STRIP_STATUS_MODE
const ledConfig_t *ledConfig = &ledStripConfig()->ledConfigs[i]; const ledConfig_t *ledConfig = &ledStripConfig()->ledConfigs[i];
sbufWriteU32(dst, *ledConfig); sbufWriteU32(dst, *ledConfig);
#else
sbufWriteU32(dst, 0);
#endif
} }
break;
// API 1.41 - add indicator for advanced profile support and the current profile selection
// 0 = basic ledstrip available
// 1 = advanced ledstrip available
#ifdef USE_LED_STRIP_STATUS_MODE
sbufWriteU8(dst, 1); // advanced ledstrip available
#else
sbufWriteU8(dst, 0); // only simple ledstrip available
#endif
sbufWriteU8(dst, ledStripConfig()->ledstrip_profile);
break;
#endif
#ifdef USE_LED_STRIP_STATUS_MODE
case MSP_LED_STRIP_MODECOLOR: case MSP_LED_STRIP_MODECOLOR:
for (int i = 0; i < LED_MODE_COUNT; i++) { for (int i = 0; i < LED_MODE_COUNT; i++) {
for (int j = 0; j < LED_DIRECTION_COUNT; j++) { for (int j = 0; j < LED_DIRECTION_COUNT; j++) {
@ -2269,27 +2287,40 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
color->v = sbufReadU8(src); color->v = sbufReadU8(src);
} }
break; break;
#endif
#ifdef USE_LED_STRIP
case MSP_SET_LED_STRIP_CONFIG: case MSP_SET_LED_STRIP_CONFIG:
{ {
i = sbufReadU8(src); i = sbufReadU8(src);
if (i >= LED_MAX_STRIP_LENGTH || dataSize != (1 + 4)) { if (i >= LED_MAX_STRIP_LENGTH || dataSize != (1 + 4)) {
return MSP_RESULT_ERROR; return MSP_RESULT_ERROR;
} }
#ifdef USE_LED_STRIP_STATUS_MODE
ledConfig_t *ledConfig = &ledStripConfigMutable()->ledConfigs[i]; ledConfig_t *ledConfig = &ledStripConfigMutable()->ledConfigs[i];
*ledConfig = sbufReadU32(src); *ledConfig = sbufReadU32(src);
reevaluateLedConfig(); reevaluateLedConfig();
#else
sbufReadU32(src);
#endif
// API 1.41 - selected ledstrip_profile
if (sbufBytesRemaining(src) >= 1) {
ledStripConfigMutable()->ledstrip_profile = sbufReadU8(src);
}
} }
break; break;
#endif
#ifdef USE_LED_STRIP_STATUS_MODE
case MSP_SET_LED_STRIP_MODECOLOR: case MSP_SET_LED_STRIP_MODECOLOR:
{ {
ledModeIndex_e modeIdx = sbufReadU8(src); ledModeIndex_e modeIdx = sbufReadU8(src);
int funIdx = sbufReadU8(src); int funIdx = sbufReadU8(src);
int color = sbufReadU8(src); int color = sbufReadU8(src);
if (!setModeColor(modeIdx, funIdx, color)) if (!setModeColor(modeIdx, funIdx, color)) {
return MSP_RESULT_ERROR; return MSP_RESULT_ERROR;
}
} }
break; break;
#endif #endif