fix nano, rename sims, churn

model10.yml

@@ -1,203 +1,236 @@
 semver: 2.9.0
 header:
-   name: "FISH"
+  name: FISH
+  bitmap: ""
+  labels: ""
   modelId:
     1:
       val: 1
 timers:
   0:
-      start: 480
+    swtch: SD0
-      swtch: "SD0"
-      value: 0
     mode: THR
-      countdownBeep: 2
+    name: ThS
     minuteBeep: 0
+    countdownBeep: 2
+    start: 480
     persistent: 0
     countdownStart: -2
+    value: 0
     showElapsed: 0
     extraHaptic: 0
-      name: "ThS"
-telemetryProtocol: 0
-thrTrim: 0
 noGlobalFunctions: 0
+thrTrim: 0
+trimInc: 0
 displayTrims: 0
 ignoreSensorIds: 0
-trimInc: 0
+showInstanceIds: 0
 disableThrottleWarning: 0
-displayChecklist: 0
+enableCustomThrottleWarning: 0
+customThrottleWarningPosition: 0
+beepANACenter: 0
 extendedLimits: 0
 extendedTrims: 0
 throttleReversed: 0
-enableCustomThrottleWarning: 0
-disableTelemetryWarning: 0
-showInstanceIds: 0
-customThrottleWarningPosition: 0
-beepANACenter: 0
 mixData:
- -
+  - destCh: 0
-   weight: 58
-   destCh: 0
     srcRaw: I0
-   carryTrim: 0
+    weight: 58
-   mixWarn: 0
+    swtch: NONE
-   mltpx: ADD
+    curve:
-   offset: 0
+      type: 0
-   swtch: "NONE"
+      value: 0
-   flightModes: 000000000
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
- -
+  - destCh: 1
-   weight: 63
-   destCh: 1
     srcRaw: I1
-   carryTrim: 0
+    weight: 63
-   mixWarn: 0
+    swtch: NONE
-   mltpx: ADD
+    curve:
-   offset: 0
+      type: 0
-   swtch: "NONE"
+      value: 0
-   flightModes: 000000000
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
- -
+  - destCh: 2
-   weight: 100
-   destCh: 2
     srcRaw: I2
-   carryTrim: 0
+    weight: 100
-   mixWarn: 0
+    swtch: NONE
-   mltpx: ADD
+    curve:
-   offset: 0
+      type: 0
-   swtch: "NONE"
+      value: 0
-   flightModes: 000000000
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
- -
+  - destCh: 2
-   weight: -100
-   destCh: 2
     srcRaw: MAX
+    weight: -100
+    swtch: SD2
+    curve:
+      type: 0
+      value: 0
+    delayUp: 0
+    delayDown: 0
+    speedUp: 0
+    speedDown: 0
     carryTrim: 1
-   mixWarn: 0
     mltpx: REPL
-   offset: 0
-   swtch: "SD2"
-   flightModes: 000000000
-   delayUp: 0
-   delayDown: 0
-   speedUp: 0
-   speedDown: 0
-   name: "Cut"
- -
-   weight: 47
-   destCh: 3
-   srcRaw: I3
-   carryTrim: 0
     mixWarn: 0
-   mltpx: ADD
-   offset: 0
-   swtch: "NONE"
     flightModes: 000000000
+    offset: 0
+    name: Cut
+  - destCh: 3
+    srcRaw: I3
+    weight: 47
+    swtch: NONE
+    curve:
+      type: 0
+      value: 0
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
 limitData:
   0:
     min: 0
     max: 0
-      ppmCenter: 0
-      offset: 0
-      symetrical: 0
     revert: 1
-      curve: 0
+    offset: 0
+    ppmCenter: 0
+    symetrical: 0
     name: ""
+    curve: 0
   1:
     min: 0
     max: 0
-      ppmCenter: 0
-      offset: 0
-      symetrical: 0
     revert: 1
+    offset: 0
+    ppmCenter: 0
+    symetrical: 0
+    name: ""
     curve: 0
-      name: ""
 expoData:
- -
+  - srcRaw: Ail
-   mode: 3
     scale: 0
-   trimSource: 0
+    mode: 3
-   srcRaw: Ail
     chn: 0
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 20
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Ele
+    name: ""
+  - srcRaw: Ele
+    scale: 0
+    mode: 3
     chn: 1
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 20
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Thr
+    name: ""
+  - srcRaw: Thr
+    scale: 0
+    mode: 3
     chn: 2
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 0
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Rud
+    name: ""
+  - srcRaw: Rud
+    scale: 0
+    mode: 3
     chn: 3
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 15
+    trimSource: 0
+    name: ""
+inputNames:
+  0:
+    val: Ail
+  1:
+    val: Ele
+  2:
+    val: Thr
+  3:
+    val: Rud
+swashR:
+  type: TYPE_NONE
+  value: 0
+  collectiveSource: NONE
+  aileronSource: NONE
+  elevatorSource: NONE
+  collectiveWeight: 0
+  aileronWeight: 0
+  elevatorWeight: 0
 thrTraceSrc: ch(2)
-switchWarningState: 
+switchWarningState: ""
+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
-thrTrimSw: 0
+disableTelemetryWarning: 0
-potsWarnMode: WARN_OFF
-jitterFilter: GLOBAL
 moduleData:
   1:
     type: TYPE_CROSSFIRE
-      subType: 0
     channelsStart: 0
     channelsCount: 16
     failsafeMode: NOT_SET
@@ -211,25 +244,15 @@ trainerData:
   frameLength: 0
   delay: 0
   pulsePol: 0
-inputNames: 
-   0:
-      val: "Ail"
-   1:
-      val: "Ele"
-   2:
-      val: "Thr"
-   3:
-      val: "Rud"
-potsWarnEnabled: 0
 telemetrySensors:
   0:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 3
-      label: "RSNR"
+    label: RSNR
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 17
     prec: 0
     autoOffset: 0
@@ -242,13 +265,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   1:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 4
-      label: "ANT"
+    label: ANT
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 0
     prec: 0
     autoOffset: 0
@@ -261,13 +284,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   2:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 5
-      label: "RFMD"
+    label: RFMD
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 0
     prec: 0
     autoOffset: 0
@@ -280,13 +303,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   3:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 6
-      label: "TPWR"
+    label: TPWR
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 16
     prec: 0
     autoOffset: 0
@@ -299,13 +322,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   4:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 7
-      label: "TRSS"
+    label: TRSS
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 17
     prec: 0
     autoOffset: 0
@@ -318,13 +341,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   5:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 8
-      label: "TQly"
+    label: TQly
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 13
     prec: 0
     autoOffset: 0
@@ -337,13 +360,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   6:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 9
-      label: "TSNR"
+    label: TSNR
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 17
     prec: 0
     autoOffset: 0
@@ -356,13 +379,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   7:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 0
-      label: "1RSS"
+    label: 1RSS
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 17
     prec: 0
     autoOffset: 0
@@ -375,13 +398,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   8:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 1
-      label: "2RSS"
+    label: 2RSS
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 17
     prec: 0
     autoOffset: 0
@@ -394,13 +417,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   9:
+    type: TYPE_CUSTOM
     id1:
       id: 20
+    subId: 0
     id2:
       instance: 2
-      label: "RQly"
+    label: RQly
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 13
     prec: 0
     autoOffset: 0
@@ -413,13 +436,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   10:
+    type: TYPE_CUSTOM
     id1:
       id: 8
+    subId: 0
     id2:
       instance: 0
-      label: "RxBt"
+    label: RxBt
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 1
     prec: 1
     autoOffset: 0
@@ -432,13 +455,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   11:
+    type: TYPE_CUSTOM
     id1:
       id: 8
+    subId: 0
     id2:
       instance: 1
-      label: "Curr"
+    label: Curr
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 2
     prec: 1
     autoOffset: 0
@@ -451,13 +474,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   12:
+    type: TYPE_CUSTOM
     id1:
       id: 8
+    subId: 0
     id2:
       instance: 2
-      label: "Capa"
+    label: Capa
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 14
     prec: 0
     autoOffset: 0
@@ -470,13 +493,13 @@ telemetrySensors:
         ratio: 0
         offset: 0
   13:
+    type: TYPE_CUSTOM
     id1:
       id: 8
+    subId: 0
     id2:
       instance: 3
-      label: "Bat%"
+    label: Bat%
-      subId: 0
-      type: TYPE_CUSTOM
     unit: 13
     prec: 0
     autoOffset: 0
@@ -488,7 +511,6 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-view: 0
 modelRegistrationID: " 692XAP-"
 usbJoystickExtMode: 0
 usbJoystickIfMode: JOYSTICK

model16.yml

@@ -1,201 +1,228 @@
 semver: 2.9.0
 header:
-   name: "Bench"
+  name: Bench
+  bitmap: ""
+  labels: ""
   modelId:
     1:
       val: 31
-telemetryProtocol: 0
-thrTrim: 0
 noGlobalFunctions: 0
+thrTrim: 0
+trimInc: 0
 displayTrims: 0
 ignoreSensorIds: 0
-trimInc: 0
+showInstanceIds: 0
 disableThrottleWarning: 0
-displayChecklist: 0
+enableCustomThrottleWarning: 0
+customThrottleWarningPosition: 0
+beepANACenter: 0
 extendedLimits: 0
 extendedTrims: 0
 throttleReversed: 0
-enableCustomThrottleWarning: 0
-disableTelemetryWarning: 0
-showInstanceIds: 0
-customThrottleWarningPosition: 0
-beepANACenter: 0
 mixData:
- -
+  - destCh: 0
-   weight: 100
-   destCh: 0
     srcRaw: I0
-   carryTrim: 0
+    weight: 100
-   mixWarn: 0
+    swtch: NONE
-   mltpx: ADD
+    curve:
-   offset: 0
+      type: 0
-   swtch: "NONE"
+      value: 0
-   flightModes: 000000000
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
- -
+  - destCh: 1
-   weight: 100
-   destCh: 1
     srcRaw: I1
-   carryTrim: 0
+    weight: 100
-   mixWarn: 0
+    swtch: NONE
-   mltpx: ADD
+    curve:
-   offset: 0
+      type: 0
-   swtch: "NONE"
+      value: 0
-   flightModes: 000000000
     delayUp: 0
     delayDown: 0
     speedUp: 0
     speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
- -
+  - destCh: 2
-   weight: 100
-   destCh: 2
     srcRaw: I2
-   carryTrim: 0
-   mixWarn: 0
-   mltpx: ADD
-   offset: 0
-   swtch: "NONE"
-   flightModes: 000000000
-   delayUp: 0
-   delayDown: 0
-   speedUp: 0
-   speedDown: 0
-   name: ""
- -
     weight: 100
-   destCh: 3
+    swtch: NONE
-   srcRaw: I3
+    curve:
-   carryTrim: 0
+      type: 0
-   mixWarn: 0
+      value: 0
-   mltpx: ADD
-   offset: 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: 3
+    srcRaw: I3
+    weight: 100
+    swtch: NONE
+    curve:
+      type: 0
+      value: 0
+    delayUp: 0
+    delayDown: 0
+    speedUp: 0
+    speedDown: 0
+    carryTrim: 0
+    mltpx: ADD
+    mixWarn: 0
+    flightModes: 000000000
+    offset: 0
     name: ""
 limitData:
   0:
     min: 23
     max: -23
-      ppmCenter: 0
-      offset: 0
-      symetrical: 0
     revert: 0
-      curve: 0
+    offset: 0
+    ppmCenter: 0
+    symetrical: 0
     name: ""
+    curve: 0
   1:
     min: 23
     max: -23
-      ppmCenter: 0
-      offset: 0
-      symetrical: 0
     revert: 0
-      curve: 0
+    offset: 0
+    ppmCenter: 0
+    symetrical: 0
     name: ""
+    curve: 0
   3:
     min: 23
     max: -23
-      ppmCenter: 0
-      offset: 0
-      symetrical: 0
     revert: 0
+    offset: 0
+    ppmCenter: 0
+    symetrical: 0
+    name: ""
     curve: 0
-      name: ""
 expoData:
- -
+  - srcRaw: Ail
-   mode: 3
     scale: 0
-   trimSource: 0
+    mode: 3
-   srcRaw: Ail
     chn: 0
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 0
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Ele
+    name: ""
+  - srcRaw: Ele
+    scale: 0
+    mode: 3
     chn: 1
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 0
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Thr
+    name: ""
+  - srcRaw: Thr
+    scale: 0
+    mode: 3
     chn: 2
-   swtch: "NONE"
+    swtch: NONE
     flightModes: 000000000
     weight: 100
-   name: ""
     offset: 0
     curve:
       type: 1
       value: 0
- -
-   mode: 3
-   scale: 0
     trimSource: 0
-   srcRaw: Rud
+    name: ""
+  - srcRaw: Rud
+    scale: 0
+    mode: 3
     chn: 3
-   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
+swashR:
+  type: TYPE_NONE
+  value: 0
+  collectiveSource: NONE
+  aileronSource: NONE
+  elevatorSource: NONE
+  collectiveWeight: 0
+  aileronWeight: 0
+  elevatorWeight: 0
 thrTraceSrc: Thr
-switchWarningState: 
+switchWarningState: ""
+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
-thrTrimSw: 0
+disableTelemetryWarning: 0
-potsWarnMode: WARN_OFF
-jitterFilter: GLOBAL
 moduleData:
   1:
     type: TYPE_CROSSFIRE
-      subType: 0
     channelsStart: 0
     channelsCount: 16
     failsafeMode: NOT_SET
     mod:
       crsf:
         telemetryBaudrate: 0
-inputNames: 
+trainerData:
-   0:
+  mode: OFF
-      val: "Ail"
+  channelsStart: 0
-   1:
+  channelsCount: -8
-      val: "Ele"
+  frameLength: 0
-   2:
+  delay: 0
-      val: "Thr"
+  pulsePol: 0
-   3:
-      val: "Rud"
-potsWarnEnabled: 0
-view: 0
 modelRegistrationID: " 692XAP-"
 usbJoystickExtMode: 0
 usbJoystickIfMode: JOYSTICK