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

Fixed 'cast-function-type' warnings, reworked CMS function pointer juggle.

Browse source
This commit is contained in:
mikeller 2019-11-26 06:12:54 +13:00
parent cf86671997
commit 438a801eb8
21 changed files with 249 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/test/unit/cms_unittest.cc
View file

@ -33,7 +33,7 @@ extern "C" {
#include "fc/rc_modes.h"
#include "fc/runtime_config.h"
void cmsMenuOpen(void);
long cmsMenuBack(displayPort_t *pDisplay);
const void *cmsMenuBack(displayPort_t *pDisplay);
uint16_t cmsHandleKey(displayPort_t *pDisplay, uint8_t key);
extern CMS_Menu *currentMenu; // Points to top entry of the current page
}
@ -71,8 +71,8 @@ TEST(CMSUnittest, TestCmsMenuExit0)
cmsDisplayPortRegister(displayPort);
cmsMenuOpen();
long exit = cmsMenuExit(displayPort, (void*)0);
EXPECT_EQ(0, exit);
const void *exit = cmsMenuExit(displayPort, (void*)0);
EXPECT_EQ(NULL, exit);
}
TEST(CMSUnittest, TestCmsMenuExit1)
@ -82,8 +82,8 @@ TEST(CMSUnittest, TestCmsMenuExit1)
cmsDisplayPortRegister(displayPort);
cmsMenuOpen();
long exit = cmsMenuExit(displayPort, (void*)0);
EXPECT_EQ(0, exit);
const void *exit = cmsMenuExit(displayPort, (void*)0);
EXPECT_EQ(NULL, exit);
}
TEST(CMSUnittest, TestCmsMenuBack)
@ -93,8 +93,8 @@ TEST(CMSUnittest, TestCmsMenuBack)
cmsDisplayPortRegister(displayPort);
cmsMenuOpen();
long exit = cmsMenuBack(displayPort);
EXPECT_EQ(0, exit);
const void *exit = cmsMenuBack(displayPort);
EXPECT_EQ(NULL, exit);
}
TEST(CMSUnittest, TestCmsMenuKey)