Merge with latest 2.3

radio/src/switches.cpp

@@ -158,11 +158,13 @@ void getSwitchesPosition(bool startup)
   CHECK_2POS(SW_SH);
 #endif
 
-#if defined(PCBX9DP) && PCBREV >= 2019
+#if defined(RADIO_X9DP2019)
   CHECK_2POS(SW_SI);
 #endif
 
-#if defined(PCBHORUS) || defined(PCBX7)
+#if defined(PCBX7ACCESS)
+  CHECK_2POS(SW_SI);
+#elif defined(PCBHORUS) || defined(PCBX7)
   CHECK_2POS(SW_SI);
   CHECK_2POS(SW_SJ);
 #endif
@@ -745,7 +747,7 @@ void checkSwitches()
     }
 #endif
 
-    doLoopCommonActions();
+    checkBacklight();
 
     WDG_RESET();