Merge branch '2.3.1' into 2.3

# Conflicts: # CREDITS.txt # radio/src/gui/480x272/radio_hardware.cpp
2019-10-05 11:41:48 +02:00
parent 268c4d4ece 63614a06f8
commit b40dfdf12b
72 changed files with 544 additions and 419 deletions
@@ -606,6 +606,9 @@ bool isInternalModuleAvailable(int moduleType)

 bool isExternalModuleAvailable(int moduleType)
 {
+  if (moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX1)
+    return false;
+
 #if !defined(HARDWARE_EXTERNAL_MODULE_SIZE_SML)
  if (isModuleTypeR9MLite(moduleType) || moduleType == MODULE_TYPE_XJT_LITE_PXX2)
    return false;