Merge with latest 2.3

2020-03-18 17:09:38 +01:00
parent 34aa1e4327 5444cd1ab6
commit 1d96af49c4
52 changed files with 514 additions and 295 deletions
@@ -326,7 +326,7 @@ uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue)
    if (isTelemetryFieldAvailable(i)) {
      TelemetrySensor * sensor = &g_model.telemetrySensors[i];
      if (sensor->id == id) {
-        return sensor->instance;
+        return sensor->frskyInstance.physID + 1;
      }
    }
  }