Remaining CPUARM removed

radio/src/tests/frsky.cpp

@@ -31,7 +31,7 @@ void displayVoltagesScreen();
 #endif
 
 
-#if defined(TELEMETRY_FRSKY) && defined(CPUARM)
+#if defined(TELEMETRY_FRSKY)
 TEST(FrSky, TelemetryValueWithMinAveraging)
 {
   /*
@@ -150,7 +150,7 @@ TEST(FrSky, Gps)
   EXPECT_EQ(telemetryItems[0].gps.longitude, 45341666);
 }
 
-#endif // defined(TELEMETRY_FRSKY) && defined(CPUARM)
+#endif // defined(TELEMETRY_FRSKY)
 
 #if defined(TELEMETRY_FRSKY_SPORT)
 TEST(FrSkySPORT, checkCrc)

radio/src/tests/gtests.h

@@ -44,7 +44,7 @@ void doMixerCalculations();
 
 inline void SYSTEM_RESET()
 {
-#if defined(CPUARM) && defined(EEPROM)
+#if defined(EEPROM)
   memset(modelHeaders, 0, sizeof(modelHeaders));
 #endif
   generalDefault();

radio/src/tests/lcd.cpp

@@ -106,7 +106,7 @@ TEST(outdezNAtt, test_unsigned)
   lcdDrawNumber(0, 0, 65530, LEFT);
   EXPECT_TRUE(checkScreenshot("unsigned")) << "Unsigned numbers will be bad displayed";
 }
-#elif defined(CPUARM) && LCD_W <= 128
+#elif LCD_W <= 128
 TEST(outdezNAtt, test_unsigned)
 {
   lcdClear();