chore: remove PCBFRSKY definition (#6424)

radio/src/audio.cpp

@@ -146,7 +146,6 @@ const char * const audioFilenames[] = {
   "midstck2",
   "midstck3",
   "midstck4",
-#if defined(PCBFRSKY)
   "midpot1",
   "midpot2",
 #if defined(PCBX9E)
@@ -164,11 +163,6 @@ const char * const audioFilenames[] = {
 #if defined(PCBX9E)
   "midslid3",
   "midslid4",
-#endif
-#else
-  "midpot1",
-  "midpot2",
-  "midpot3",
 #endif
   "mixwarn1",
   "mixwarn2",
@@ -395,7 +389,7 @@ inline void mixSample(audio_data_t * result, int16_t sample, unsigned int fade)
   *result = (audio_data_t)_sat_s16(tmp);
 #elif AUDIO_SAMPLE_FMT == AUDIO_SAMPLE_FMT_U16
   *result = (audio_data_t)_sat_u16((uint32_t)tmp);
-#endif 
+#endif
 }
 
 #define RIFF_CHUNK_SIZE 12
@@ -976,15 +970,11 @@ void audioEvent(unsigned int index)
       case AU_POT6_MIDDLE:
       case AU_POT7_MIDDLE:
 #endif
-#if defined(PCBFRSKY)
       case AU_SLIDER1_MIDDLE:
       case AU_SLIDER2_MIDDLE:
 #if defined(PCBX9E)
       case AU_SLIDER3_MIDDLE:
       case AU_SLIDER4_MIDDLE:
-#endif
-#else
-      case AU_POT3_MIDDLE:
 #endif
         audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 80, 20, PLAY_NOW);
         break;

radio/src/edgetx.cpp

@@ -635,7 +635,6 @@ void checkSDfreeStorage() {
   }
 }
 
-#if defined(PCBFRSKY) || defined(PCBFLYSKY)
 static void checkFailsafe()
 {
   for (int i=0; i<NUM_MODULES; i++) {
@@ -652,9 +651,6 @@ static void checkFailsafe()
     }
   }
 }
-#else
-#define checkFailsafe()
-#endif
 
 #if defined(GUI)
 void checkAll(bool isBootCheck)

radio/src/edgetx.h

@@ -502,30 +502,24 @@ enum AUDIO_SOUNDS {
   AU_STICK2_MIDDLE,
   AU_STICK3_MIDDLE,
   AU_STICK4_MIDDLE,
-#if defined(PCBFRSKY)
   AU_POT1_MIDDLE,
   AU_POT2_MIDDLE,
 #if defined(PCBX9E)
   AU_POT3_MIDDLE,
   AU_POT4_MIDDLE,
-#endif
+#endif //X9E
 #if defined(PCBX10)
   AU_POT4_MIDDLE,
   AU_POT5_MIDDLE,
   AU_POT6_MIDDLE,
   AU_POT7_MIDDLE,
-#endif
+#endif //X10
   AU_SLIDER1_MIDDLE,
   AU_SLIDER2_MIDDLE,
 #if defined(PCBX9E)
   AU_SLIDER3_MIDDLE,
   AU_SLIDER4_MIDDLE,
-#endif
-#else
-  AU_POT1_MIDDLE,
-  AU_POT2_MIDDLE,
-  AU_POT3_MIDDLE,
-#endif
+#endif // X9E
   AU_MIX_WARNING_1,
   AU_MIX_WARNING_2,
   AU_MIX_WARNING_3,

radio/src/targets/horus/CMakeLists.txt

@@ -28,8 +28,6 @@ set(CPU_TYPE_FULL STM32F429xI)
 set(TARGET_LINKER_DIR stm32f429_sdram)
 set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM2=8192")
 
-add_definitions(-DPCBFRSKY)
-
 # defines existing internal modules
 set(INTERNAL_MODULES PXX1;PXX2;MULTI;CRSF CACHE STRING "Internal modules")
 

radio/src/targets/stm32h7s78-dk/CMakeLists.txt

@@ -44,7 +44,7 @@ set(FIRMWARE_QSPI ON)
 
 add_definitions(
   -DSTM32H7S7xx -DFIRMWARE_QSPI
-  -DSDRAM -DCOLORLCD -DLIBOPENUI -DPCBHORUS -DPCBX10 -DPCBFRSKY
+  -DSDRAM -DCOLORLCD -DLIBOPENUI -DPCBHORUS -DPCBX10
   -DHARDWARE_TOUCH -DSOFTWARE_KEYBOARD
   -DAUDIO -DVOICE -DSOFTWARE_VOLUME
 )

radio/src/targets/taranis/CMakeLists.txt

@@ -17,7 +17,7 @@ set(HSE_VALUE 12000000)
 set(TARGET_DIR taranis)
 set(PPM_LIMITS_SYMETRICAL YES)
 
-add_definitions(-DPCBFRSKY -DPCBTARANIS -DAUDIO -DVOICE)
+add_definitions(-DPCBTARANIS -DAUDIO -DVOICE)
 
 if(PCB STREQUAL X9E)
   set(DEFAULT_INTERNAL_MODULE XJT_PXX1 CACHE STRING "Default internal module")

radio/src/telemetry/telemetry.cpp

@@ -330,7 +330,7 @@ void telemetryWakeup()
       audioEvent(AU_SENSOR_LOST);
     }
 
-#if defined(PCBFRSKY)
+#if defined(PXX1) || defined(PXX2)
     if (isBadAntennaDetected()) {
       AUDIO_RAS_RED();
       POPUP_WARNING_ON_UI_TASK(STR_WARNING, STR_ANTENNAPROBLEM);

radio/src/tests/functions.cpp

@@ -36,7 +36,6 @@ TEST_F(SpecialFunctionsTest, SwitchFiledSize)
          "values";
 }
 
-#if defined(PCBFRSKY)
 TEST_F(SpecialFunctionsTest, FlightReset)
 {
   g_model.customFn[0].swtch = SWSRC_FIRST_SWITCH;
@@ -122,6 +121,3 @@ TEST_F(SpecialFunctionsTest, GvarsInc)
   EXPECT_EQ(g_model.flightModeData[0].gvars[0], 28);
 }
 #endif // #if defined(GVARS)
-
-#endif // #if defined(PCBFRSKY)
-

radio/src/tests/gtests.h

@@ -46,12 +46,8 @@ 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(PCBFRSKY)
 #define RADIO_RESET() \
   g_eeGeneral.switchConfig = 0x00007bff
-#else
-  #define RADIO_RESET()
-#endif
 
 inline void SYSTEM_RESET()
 {

radio/src/tests/switches.cpp

@@ -103,7 +103,6 @@ TEST(getSwitch, inputWithTrim)
 }
 #endif
 
-#if defined(PCBFRSKY)
 TEST(evalLogicalSwitches, playFile)
 {
   SYSTEM_RESET();
@@ -135,7 +134,6 @@ TEST(evalLogicalSwitches, playFile)
 
 #undef MODELNAME
 }
-#endif
 
 #define SWSRC_SA2 (SWSRC_FIRST_SWITCH + 2)
 #define SWSRC_SD2 (SWSRC_FIRST_SWITCH + 3 * 3 + 2)