Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

Fix stick pos calcuation and OSD init order to make sure OSD displayport is initialized first

Browse source
This commit is contained in:
Konstantin Sharlaimov (DigitalEntity) 2017-04-29 15:49:37 +10:00
parent 65aa69363a
commit 6944eeda10
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/fc/fc_init.c
View file

@ -499,10 +499,6 @@ void init(void)
mspFcInit(); mspFcInit();
mspSerialInit(); mspSerialInit();
#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
cmsDisplayPortRegister(displayPortMspInit());
#endif
#ifdef USE_CLI #ifdef USE_CLI
cliInit(serialConfig()); cliInit(serialConfig());
#endif #endif
@ -517,6 +513,10 @@ void init(void)
} }
#endif #endif
#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
cmsDisplayPortRegister(displayPortMspInit());
#endif
#ifdef GPS #ifdef GPS
if (feature(FEATURE_GPS)) { if (feature(FEATURE_GPS)) {
gpsInit(); gpsInit();

5
src/main/fc/rc_controls.c
View file

@ -139,10 +139,9 @@ stickPositions_e getRcStickPositions(void)
bool checkStickPosition(stickPositions_e stickPos) bool checkStickPosition(stickPositions_e stickPos)
{ {
const uint8_t mask[4] = { 0x03, 0x0C, 0x30, 0xC0 };
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
const uint32_t mask = (0x03 << i); if (((stickPos & mask[i]) != 0) && ((stickPos & mask[i]) != (rcStickPositions & mask[i]))) {
const stickPositions_e checkPos = stickPos & mask;
if ((checkPos != 0) && (checkPos != (rcStickPositions & mask))) {
return false; return false;
} }
} }