1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00

Changes for an improved UX.

This commit is contained in:
mikeller 2018-07-15 23:37:19 +12:00
parent df55fc99ec
commit aff5653981

View file

@ -1384,17 +1384,31 @@ static mspResult_e mspFcProcessOutCommandWithArg(uint8_t cmdMSP, sbuf_t *src, sb
if (sbufBytesRemaining(src)) { if (sbufBytesRemaining(src)) {
rebootMode = sbufReadU8(src); rebootMode = sbufReadU8(src);
if (rebootMode >= MSP_REBOOT_COUNT || (rebootMode == MSP_REBOOT_MSC if (rebootMode >= MSP_REBOOT_COUNT
#if defined(USE_USB_MSC) #if !defined(USE_USB_MSC)
&& !mscCheckFilesystemReady() || rebootMode == MSP_REBOOT_MSC
#endif #endif
)) { ) {
return MSP_RESULT_ERROR; return MSP_RESULT_ERROR;
} }
} else { } else {
rebootMode = MSP_REBOOT_FIRMWARE; rebootMode = MSP_REBOOT_FIRMWARE;
} }
sbufWriteU8(dst, rebootMode);
#if defined(USE_USB_MSC)
if (rebootMode == MSP_REBOOT_MSC) {
if (mscCheckFilesystemReady()) {
sbufWriteU8(dst, 1);
} else {
sbufWriteU8(dst, 0);
return MSP_RESULT_ACK;
}
}
#endif
if (mspPostProcessFn) { if (mspPostProcessFn) {
*mspPostProcessFn = mspRebootFn; *mspPostProcessFn = mspRebootFn;
} }