update inav, sims, dragonfly bymea

2 years ago · 2840ded073
parent 18cc5bd5f3
commit 2840ded073
4 changed files with 4158 additions and 2818 deletions
--- a/model13.yml
+++ b/model13.yml
--- a/model15.yml
+++ b/model15.yml
@ -1,157 +1,141 @@
 semver: 2.9.0
 header: 
-  name: SimWings
-  bitmap: ""
-  labels: ""
+   name: "SimWings"
   modelId: 
      1:
         val: 21
-noGlobalFunctions: 0
+telemetryProtocol: 0
 thrTrim: 0
-trimInc: 0
+noGlobalFunctions: 0
 displayTrims: 0
 ignoreSensorIds: 0
-showInstanceIds: 0
+trimInc: 0
 disableThrottleWarning: 0
-enableCustomThrottleWarning: 0
-customThrottleWarningPosition: 0
-beepANACenter: 0
+displayChecklist: 0
 extendedLimits: 0
 extendedTrims: 0
 throttleReversed: 0
-flightModeData:
-  0:
-    trim:
-      1:
-        value: 2
-        mode: 0
-    name: ""
-    fadeIn: 0
-    fadeOut: 0
+enableCustomThrottleWarning: 0
+disableTelemetryWarning: 1
+showInstanceIds: 0
+customThrottleWarningPosition: 0
+beepANACenter: 0
 mixData: 
-  - destCh: 0
-    srcRaw: I0
+ -
   weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   destCh: 0
+   srcRaw: I0
+   carryTrim: 0
+   mixWarn: 0
+   mltpx: ADD
+   offset: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 1
+   srcRaw: I1
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 1
-    srcRaw: I1
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 2
+   srcRaw: I2
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 2
-    srcRaw: I2
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 3
+   srcRaw: I3
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 3
-    srcRaw: I3
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 4
+   srcRaw: I9
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 4
-    srcRaw: I9
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 5
+   srcRaw: I5
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 5
-    srcRaw: I5
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: ""
+ -
+   weight: 100
+   destCh: 6
+   srcRaw: I6
   carryTrim: 0
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: ""
-  - destCh: 6
-    srcRaw: I6
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
-    carryTrim: 0
-    mltpx: ADD
-    mixWarn: 0
-    flightModes: 000000000
-    offset: 0
   name: ""
-  - destCh: 19
-    srcRaw: Ail
+ -
   weight: 100
-    swtch: NONE
+   destCh: 19
+   srcRaw: Ail
+   carryTrim: 1
+   mixWarn: 0
+   mltpx: ADD
+   offset: 0
+   swtch: "NONE"
+   flightModes: 000000000
   curve: 
      type: 2
      value: 3
@ -159,16 +143,17 @@ mixData:
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "MovA"
+ -
+   weight: 100
+   destCh: 19
+   srcRaw: Ele
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: MovA
-  - destCh: 19
-    srcRaw: Ele
-    weight: 100
-    swtch: NONE
+   swtch: "NONE"
+   flightModes: 000000000
   curve: 
      type: 2
      value: 3
@ -176,16 +161,17 @@ mixData:
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "MovE"
+ -
+   weight: 100
+   destCh: 19
+   srcRaw: Rud
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: MovE
-  - destCh: 19
-    srcRaw: Rud
-    weight: 100
-    swtch: NONE
+   swtch: "NONE"
+   flightModes: 000000000
   curve: 
      type: 2
      value: 3
@ -193,457 +179,447 @@ mixData:
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "MovR"
+ -
+   weight: 100
+   destCh: 20
+   srcRaw: Ail
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: MovR
-  - destCh: 20
-    srcRaw: Ail
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "InstA"
+ -
+   weight: 100
+   destCh: 20
+   srcRaw: tr(0)
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: REPL
   offset: 0
-    name: InstA
-  - destCh: 20
-    srcRaw: tr(0)
-    weight: 100
-    swtch: L3
-    curve:
-      type: 0
-      value: 0
+   swtch: "L3"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "StuA"
+ -
+   weight: 100
+   destCh: 21
+   srcRaw: Ele
   carryTrim: 1
-    mltpx: REPL
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: StuA
-  - destCh: 21
-    srcRaw: Ele
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "InstE"
+ -
+   weight: 100
+   destCh: 21
+   srcRaw: tr(1)
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: REPL
   offset: 0
-    name: InstE
-  - destCh: 21
-    srcRaw: tr(1)
-    weight: 100
-    swtch: L3
-    curve:
-      type: 0
-      value: 0
+   swtch: "L3"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "StuE"
+ -
+   weight: 100
+   destCh: 22
+   srcRaw: Thr
   carryTrim: 1
-    mltpx: REPL
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: StuE
-  - destCh: 22
-    srcRaw: Thr
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "InstT"
+ -
+   weight: 100
+   destCh: 22
+   srcRaw: tr(2)
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: REPL
   offset: 0
-    name: InstT
-  - destCh: 22
-    srcRaw: tr(2)
-    weight: 100
-    swtch: L3
-    curve:
-      type: 0
-      value: 0
+   swtch: "L3"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "StuT"
+ -
+   weight: 100
+   destCh: 23
+   srcRaw: Rud
   carryTrim: 1
-    mltpx: REPL
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: ADD
   offset: 0
-    name: StuT
-  - destCh: 23
-    srcRaw: Rud
-    weight: 100
-    swtch: NONE
-    curve:
-      type: 0
-      value: 0
+   swtch: "NONE"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
+   name: "InstR"
+ -
+   weight: 100
+   destCh: 23
+   srcRaw: tr(3)
   carryTrim: 1
-    mltpx: ADD
   mixWarn: 0
-    flightModes: 000000000
+   mltpx: REPL
   offset: 0
-    name: InstR
-  - destCh: 23
-    srcRaw: tr(3)
-    weight: 100
-    swtch: L3
-    curve:
-      type: 0
-      value: 0
+   swtch: "L3"
+   flightModes: 000000000
   delayUp: 0
   delayDown: 0
   speedUp: 0
   speedDown: 0
-    carryTrim: 1
-    mltpx: REPL
-    mixWarn: 0
-    flightModes: 000000000
-    offset: 0
-    name: StuR
+   name: "StuR"
 limitData: 
   0:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: Ail
+      revert: 0
      curve: 0
+      name: "Ail"
   1:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: Ele
+      revert: 0
      curve: 0
+      name: "Ele"
   2:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: Thr
+      revert: 0
      curve: 0
+      name: "Thr"
   3:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: Rud
+      revert: 0
      curve: 0
+      name: "Rud"
   4:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: RST
+      revert: 0
      curve: 0
+      name: "RST"
   5:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: FLAP
+      revert: 0
      curve: 0
+      name: "FLAP"
   6:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: RATE
+      revert: 0
      curve: 0
+      name: "RATE"
   19:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: EndT
+      revert: 0
      curve: 0
+      name: "EndT"
   20:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: ISA
+      revert: 0
      curve: 0
+      name: "ISA"
   21:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: ISE
+      revert: 0
      curve: 0
+      name: "ISE"
   22:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: IST
+      revert: 0
      curve: 0
+      name: "IST"
   23:
      min: 0
      max: 0
-    revert: 0
-    offset: 0
      ppmCenter: 0
+      offset: 0
      symetrical: 0
-    name: ISR
+      revert: 0
      curve: 0
+      name: "ISR"
 expoData: 
-  - srcRaw: ch(20)
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: -4
+   srcRaw: ch(20)
   chn: 0
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: -4
-    name: ""
-  - srcRaw: ch(21)
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: -2
+   srcRaw: ch(21)
   chn: 1
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: -2
-    name: ""
-  - srcRaw: ch(22)
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: -3
+   srcRaw: ch(22)
   chn: 2
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: -3
-    name: ""
-  - srcRaw: ch(23)
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: -1
+   srcRaw: ch(23)
   chn: 3
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: -1
-    name: ""
-  - srcRaw: SA
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SA
   chn: 4
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-  - srcRaw: SB
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SB
   chn: 5
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-  - srcRaw: SC
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SC
   chn: 6
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-  - srcRaw: SD
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SD
   chn: 7
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-  - srcRaw: SE
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SE
   chn: 8
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-  - srcRaw: SF
-    scale: 0
+ -
   mode: 3
+   scale: 0
+   trimSource: 0
+   srcRaw: SF
   chn: 9
-    swtch: NONE
+   swtch: "NONE"
   flightModes: 000000000
   weight: 100
+   name: ""
   offset: 0
   curve: 
      type: 1
      value: 0
-    trimSource: 0
-    name: ""
-inputNames:
-  0:
-    val: Ail
-  1:
-    val: Ele
-  2:
-    val: Thr
-  3:
-    val: Rud
 logicalSw: 
   0:
      func: FUNC_VPOS
-    def: ch(19),30
+      def: "ch(19),30"
+      andsw: "NONE"
      delay: 0
      duration: 0
-    andsw: NONE
   1:
      func: FUNC_OR
-    def: SE0,L1
+      def: "SE0,L1"
+      andsw: "NONE"
      delay: 0
      duration: 0
-    andsw: NONE
   2:
      func: FUNC_STICKY
-    def: SE2,L2
+      def: "SE2,L2"
+      andsw: "NONE"
      delay: 0
      duration: 0
-    andsw: NONE
 customFn: 
   0:
-    swtch: L3
+      swtch: "L3"
      func: PLAY_TRACK
-    def: trnon,1x
+      def: "trnon,1x"
   1:
      swtch: "!L3"
      func: PLAY_TRACK
-    def: trnoff,!1x
-swashR:
-  type: TYPE_NONE
-  value: 0
-  collectiveSource: NONE
-  aileronSource: NONE
-  elevatorSource: NONE
-  collectiveWeight: 0
-  aileronWeight: 0
-  elevatorWeight: 0
+      def: "trnoff,!1x"
+flightModeData: 
+   0:
+      trim: 
+         1:
+            value: 2
+            mode: 0
+      name: ""
+      swtch: "NONE"
+      fadeIn: 0
+      fadeOut: 0
+      gvars: 
+         0:
+            val: 0
+         1:
+            val: 0
+         2:
+            val: 0
+         3:
+            val: 0
+         4:
+            val: 0
+         5:
+            val: 0
+         6:
+            val: 0
+         7:
+            val: 0
+         8:
+            val: 0
 thrTraceSrc: Thr
 switchWarningState: BuCuEu
-thrTrimSw: 0
-potsWarnMode: WARN_OFF
-jitterFilter: GLOBAL
-potsWarnEnabled: 0
-displayChecklist: 0
-telemetryProtocol: 0
-varioData:
-  source: none
-  centerSilent: 0
-  centerMax: 0
-  centerMin: 0
-  min: 0
-  max: 0
 rssiSource: none
 rfAlarms: 
   warning: 45
   critical: 42
-disableTelemetryWarning: 1
+thrTrimSw: 0
+potsWarnMode: WARN_OFF
+jitterFilter: GLOBAL
 moduleData: 
   1:
      type: TYPE_CROSSFIRE
+      subType: 0
      channelsStart: 0
      channelsCount: 16
      failsafeMode: NOT_SET
@ -657,6 +633,17 @@ trainerData:
   frameLength: 0
   delay: 0
   pulsePol: 0
+inputNames: 
+   0:
+      val: "Ail"
+   1:
+      val: "Ele"
+   2:
+      val: "Thr"
+   3:
+      val: "Rud"
+potsWarnEnabled: 0
+view: 0
 modelRegistrationID: " 692XAP-"
 usbJoystickExtMode: 0
 usbJoystickIfMode: JOYSTICK
--- a/model17.yml
+++ b/model17.yml
--- a/model18.yml
+++ b/model18.yml