New UI merged

radio/src/tests/functions.cpp

@@ -31,7 +31,7 @@ TEST_F(SpecialFunctionsTest, SwitchFiledSize)
   EXPECT_EQ(g_model.customFn[0].swtch, -SWSRC_LAST) << "CustomFunctionData.swtch member is too small to hold all possible values";
 }
 
-#if defined(PCBTARANIS) || defined(PCBHORUS)
+#if defined(PCBFRSKY)
 TEST_F(SpecialFunctionsTest, FlightReset)
 {
   g_model.customFn[0].swtch = SWSRC_SA0;
@@ -114,5 +114,5 @@ TEST_F(SpecialFunctionsTest, GvarsInc)
 }
 #endif // #if defined(GVARS)
 
-#endif // #if defined(PCBTARANIS) || defined(PCBHORUS)
+#endif // #if defined(PCBFRSKY)
 

radio/src/tests/gtests.h

@@ -40,7 +40,7 @@ extern const char * nchar2string(const char * string, int size);
 #define EXPECT_ZSTREQ(c_string, z_string)   EXPECT_STREQ(c_string, zchar2string(z_string, sizeof(z_string)))
 #define EXPECT_STRNEQ(c_string, n_string)   EXPECT_STREQ(c_string, nchar2string(n_string, sizeof(n_string)))
 
-#if defined(PCBTARANIS) || defined(PCBHORUS)
+#if defined(PCBFRSKY)
 #define RADIO_RESET() \
   g_eeGeneral.switchConfig = 0x00007bff
 #else

radio/src/tests/lcd_480x272.cpp

@@ -32,7 +32,7 @@
 
 #if defined(COLORLCD)
 
-void doPaint_480x272(QPainter & p)
+void doPaint_colorlcd(QPainter & p)
 {
   QRgb rgb = qRgb(0, 0, 0);
   p.setBackground(QBrush(rgb));
@@ -60,12 +60,12 @@ void doPaint_480x272(QPainter & p)
   }
 }
 
-bool checkScreenshot_480x272(const QString & test)
+bool checkScreenshot_colorlcd(const QString & test)
 {
   lcdRefresh();
   QImage buffer(LCD_W, LCD_H, QImage::Format_RGB32);
   QPainter p(&buffer);
-  doPaint_480x272(p);
+  doPaint_colorlcd(p);
   QString filename(QString("%1_%2x%3.png").arg(test).arg(LCD_W).arg(LCD_H));
   QImage reference(TESTS_PATH "/" + filename);
 
@@ -80,22 +80,22 @@ bool checkScreenshot_480x272(const QString & test)
 }
 
 
-TEST(Lcd_480x272, vline)
+TEST(Lcd_colorlcd, vline)
 {
   loadFonts();
   lcd->clear(TEXT_BGCOLOR);
   for (int x=0; x<100; x+=2) {
     lcdDrawSolidVerticalLine(x, x/2, 12, TEXT_COLOR);
   }
-  EXPECT_TRUE(checkScreenshot_480x272("vline"));
+  EXPECT_TRUE(checkScreenshot_colorlcd("vline"));
 }
 
-TEST(Lcd_480x272, primitives)
+TEST(Lcd_colorlcd, primitives)
 {
   loadFonts();
   lcd->clear(TEXT_BGCOLOR);
-  lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", CURVE_AXIS_COLOR|NO_FONTCACHE);
-  lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|NO_FONTCACHE);
+  lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", CURVE_AXIS_COLOR);
+  lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR);
 
   lcdDrawFilledRect(10, 30, 30, 30, SOLID, TITLE_BGCOLOR);
   lcdDrawFilledRect(50, 30, 30, 30, DOTTED, TEXT_COLOR);
@@ -115,15 +115,15 @@ TEST(Lcd_480x272, primitives)
   lcdDrawHorizontalLine(30, 85,  70, SOLID, TEXT_COLOR);
 
 
-  EXPECT_TRUE(checkScreenshot_480x272("primitives"));
+  EXPECT_TRUE(checkScreenshot_colorlcd("primitives"));
 }
 
-TEST(Lcd_480x272, transparency)
+TEST(Lcd_colorlcd, transparency)
 {
   loadFonts();
   lcd->clear(TEXT_BGCOLOR);
-  lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4)|NO_FONTCACHE);
-  lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12)|NO_FONTCACHE);
+  lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4));
+  lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12));
 
   lcdDrawFilledRect(10, 30, 30, 30, SOLID, TITLE_BGCOLOR|OPACITY(8));
   lcdDrawFilledRect(50, 30, 30, 30, DOTTED, TEXT_COLOR|OPACITY(10));
@@ -152,26 +152,25 @@ TEST(Lcd_480x272, transparency)
 
   }
 
-  EXPECT_TRUE(checkScreenshot_480x272("transparency"));
+  EXPECT_TRUE(checkScreenshot_colorlcd("transparency"));
 }
 
-TEST(Lcd_480x272, fonts)
+TEST(Lcd_colorlcd, fonts)
 {
   loadFonts();
-  loadFontCache();
   lcd->clear(TEXT_BGCOLOR);
 
   lcdDrawText(8, 8, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(4));
   lcdDrawText(5, 5, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|OPACITY(12));
 
-  lcdDrawText(10, 200, "The quick", TEXT_COLOR|VERTICAL|NO_FONTCACHE);
-  lcdDrawText(30, 200, "The quick brown fox", TEXT_COLOR|VERTICAL|NO_FONTCACHE);
-  // lcdDrawText(50, 200, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|VERTICAL|NO_FONTCACHE);
+  lcdDrawText(10, 200, "The quick", TEXT_COLOR|VERTICAL);
+  lcdDrawText(30, 200, "The quick brown fox", TEXT_COLOR|VERTICAL);
+  // lcdDrawText(50, 200, "The quick brown fox jumps over the lazy dog", TEXT_COLOR|VERTICAL);
 
   lcdDrawText(8, 208, "The quick brown fox jumps over the lazy dog", TITLE_BGCOLOR|OPACITY(4));
   lcdDrawText(5, 205, "The quick brown fox jumps over the lazy dog", TITLE_BGCOLOR|OPACITY(12));
 
-  EXPECT_TRUE(checkScreenshot_480x272("fonts"));
+  EXPECT_TRUE(checkScreenshot_colorlcd("fonts"));
 }
 
 

radio/src/tests/mixer.cpp

@@ -500,7 +500,7 @@ TEST_F(MixerTest, DelayOnSwitch)
   g_model.mixData[0].mltpx = MLTPX_ADD;
   g_model.mixData[0].srcRaw = MIXSRC_MAX;
   g_model.mixData[0].weight = 100;
-#if defined(PCBTARANIS) || defined(PCBHORUS)
+#if defined(PCBFRSKY)
   g_model.mixData[0].swtch = SWSRC_SA2;
   int switch_index = 0;
 #else

radio/src/tests/switches.cpp

@@ -94,7 +94,7 @@ TEST(getSwitch, inputWithTrim)
 }
 #endif
 
-#if defined(PCBTARANIS) || defined(PCBHORUS)
+#if defined(PCBFRSKY)
 TEST(evalLogicalSwitches, playFile)
 {
   SYSTEM_RESET();