Merge pull request #495 from EdgeTX/main

Merge from main
2021-07-24 00:23:37 +08:00
parent 185b201251 fd94ffeb86
commit d9d4591008
49 changed files with 2395 additions and 474 deletions
@@ -672,6 +672,22 @@ PACK(struct ModelData {
        return thrTrimSw + MIXSRC_FIRST_TRIM;
    }
  }
+
+  void setThrottleStickTrimSource(int16_t src)
+  {
+    // The order here is TERA, so that 0 (default) means Throttle
+    switch (src) {
+      case MIXSRC_TrimThr:
+        thrTrimSw = 0;
+        break;
+      case MIXSRC_TrimRud:
+        thrTrimSw = 2;
+        break;
+      default:
+        thrTrimSw = src - MIXSRC_FIRST_TRIM;
+        break;
+    }
+  }
 });

 /*