Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 14:55:21 +03:00
Code Issues Wiki Activity

Prevent font upload if max7456 is not detected

Browse source 
Prevents wedge if a font upload is attempted but the max7456 device wasn't detected during initialization.
This commit is contained in:
Bruce Luckcuck 2019-11-09 14:26:08 -05:00
parent c77c593a14
commit a12ab13462
3 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,7 @@
#include "common/streambuf.h"
#include "common/utils.h"
#include "config/config.h"
#include "config/config_eeprom.h"
#include "config/feature.h"
@ -67,7 +68,6 @@
#include "drivers/vtx_table.h"
#include "fc/board_info.h"
#include "config/config.h"
#include "fc/controlrate_profile.h"
#include "fc/core.h"
#include "fc/rc.h"
@ -110,6 +110,7 @@
#include "pg/beeper.h"
#include "pg/board.h"
#include "pg/gyrodev.h"
#include "pg/max7456.h"
#include "pg/motor.h"
#include "pg/rx.h"
#include "pg/rx_spi.h"
@ -796,13 +797,19 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
#define OSD_FLAGS_RESERVED_1 (1 << 2)
#define OSD_FLAGS_RESERVED_2 (1 << 3)
#define OSD_FLAGS_OSD_HARDWARE_MAX_7456 (1 << 4)
#define OSD_FLAGS_MAX7456_DETECTED (1 << 5)
uint8_t osdFlags = 0;
#if defined(USE_OSD)
osdFlags |= OSD_FLAGS_OSD_FEATURE;
#endif
#ifdef USE_MAX7456
osdFlags |= OSD_FLAGS_OSD_HARDWARE_MAX_7456;
if (max7456Config()->csTag && max7456Config()->spiDevice) {
osdFlags |= OSD_FLAGS_OSD_HARDWARE_MAX_7456;
if (max7456IsDeviceDetected()) {
osdFlags |= OSD_FLAGS_MAX7456_DETECTED;
}
}
#endif
sbufWriteU8(dst, osdFlags);
@ -3281,7 +3288,9 @@ static mspResult_e mspCommonProcessInCommand(mspDescriptor_t srcDesc, uint8_t cm
font_data[i] = sbufReadU8(src);
}
// !!TODO - replace this with a device independent implementation
max7456WriteNvm(addr, font_data);
if (!max7456WriteNvm(addr, font_data)) {
return MSP_RESULT_ERROR;
}
}
break;
#else