Merge with latest 2.3

radio/src/telemetry/frsky_sport.cpp

@@ -168,7 +168,13 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packe
   if (primId == DATA_FRAME) {
     uint8_t originMask;
     if (origin == TELEMETRY_ENDPOINT_SPORT) {
+#if defined(SIMU) && defined(INTERNAL_MODULE_PXX2)
+      // When running simu on ACCESS radio, we set the origin as internal module
+      origin = 0;
+      originMask = 0x01;
+#else
       originMask = 0x04;
+#endif
     }
     else {
       uint8_t moduleIndex = (origin >> 2);

radio/src/telemetry/telemetry.h

@@ -153,7 +153,7 @@ inline uint8_t modelTelemetryProtocol()
     return PROTOCOL_TELEMETRY_MULTIMODULE;
   }
 #if defined(INTERNAL_MODULE_MULTI)
-  if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE) {
+  if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
     return PROTOCOL_TELEMETRY_MULTIMODULE;
   }
 #endif