Merge from 2.3
This commit is contained in:
@@ -52,8 +52,8 @@ if(GTEST_INCDIR AND GTEST_SRCDIR AND Qt5Widgets_FOUND)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
|
||||
endif()
|
||||
|
||||
add_executable(gtests-radio EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp ../targets/simu/simufatfs.cpp)
|
||||
add_dependencies(gtests-radio ${RADIO_DEPENDENCIES} gtests-radio-lib)
|
||||
add_executable(gtests-radio EXCLUDE_FROM_ALL ${GTEST_SRC} ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp ../targets/simu/simufatfs.cpp)
|
||||
add_dependencies(gtests-radio ${RADIO_DEPENDENCIES} ${FIRMWARE_DEPENDENCIES} gtests-radio-lib)
|
||||
if(PCB STREQUAL X12S OR PCB STREQUAL X10)
|
||||
add_dependencies(gtests-radio ${HORUS_MODEL_FILES})
|
||||
endif()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 357 B |
Binary file not shown.
|
After Width: | Height: | Size: 379 B |
+14
-3
@@ -96,9 +96,7 @@ bool checkScreenshot(const QString & test)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(COLORLCD)
|
||||
// TODO
|
||||
#else
|
||||
#if !defined(COLORLCD)
|
||||
TEST(outdezNAtt, test_unsigned)
|
||||
{
|
||||
lcdClear();
|
||||
@@ -238,6 +236,19 @@ TEST(Lcd, Midsize)
|
||||
EXPECT_TRUE(checkScreenshot("midsize"));
|
||||
}
|
||||
|
||||
TEST(Lcd, MidsizeNextPosPrec1)
|
||||
{
|
||||
lcdClear();
|
||||
|
||||
lcdDrawText(10, 1, "80", MIDSIZE);
|
||||
lcdDrawText(lcdNextPos, 1, "V", MIDSIZE);
|
||||
|
||||
lcdDrawNumber(10, 15, 80, MIDSIZE | PREC1);
|
||||
lcdDrawText(lcdNextPos, 15, "V", MIDSIZE);
|
||||
|
||||
EXPECT_TRUE(checkScreenshot("MidsizeNextPosPrec1"));
|
||||
}
|
||||
|
||||
TEST(Lcd, Dblsize)
|
||||
{
|
||||
lcdClear();
|
||||
|
||||
Reference in New Issue
Block a user