Merge with latest 2.3

2020-10-07 21:01:45 +02:00
parent fd9ae06519 c07be1eb9b
commit 42a3198568
376 changed files with 10566 additions and 8633 deletions
@@ -390,6 +390,11 @@ void drawSensorCustomValue(coord_t x, coord_t y, uint8_t sensor, int32_t value,
    return;
  }

+  if (IS_FAI_FORBIDDEN(MIXSRC_FIRST_TELEM + 3 * sensor)) {
+    lcdDrawText(x, y, "FAI mode", flags);
+    return;
+  }
+
  TelemetryItem & telemetryItem = telemetryItems[sensor];
  TelemetrySensor & telemetrySensor = g_model.telemetrySensors[sensor];

@@ -434,6 +439,10 @@ void drawSensorCustomValue(coord_t x, coord_t y, uint8_t sensor, int32_t value,
              "Rx2 Lost",
              "Rx1 NS",
              "Rx2 NS",
+              "Rx3 FS",
+              "Rx3 LF",
+              "Rx3 Lost",
+              "Rx3 NS"
            };
            for (uint8_t i = 0; i < DIM(RXS_STATUS); i++) {
              if (value & (1u << i)) {