Merge branch 'next' into bsongis/issue_2056_set_rtc_from_gps

2015-03-21 12:19:01 +04:00
parent 4318d04707 7ab483d469
commit c3cc3bd7d2
35 changed files with 687 additions and 194 deletions
@@ -551,7 +551,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case FlightModesName:
      return (IS_TARANIS(board) ? 10 : 6);
    case GvarsName:
-      return 6;
+      return (IS_9X(board) ? 0 : 6);
    case HasChNames:
      return (IS_TARANIS(board) ? 1 : 0);
    case GvarsInCS: