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
@@ -355,7 +355,7 @@ void convertModelData_218_to_219(ModelData &model)
        }
      }
    }
-    else if (screenType == TELEMETRY_SCREEN_TYPE_GAUGES) {
+    else if (screenType == TELEMETRY_SCREEN_TYPE_BARS) {
      for (int j = 0; j < 4; j++) {
        newModel.screens[i].bars[j].source = convertSource_218_to_219(oldModel.frsky.screens[i].bars[j].source);
      }