From 0640f395acafda3d41dbc072a67b12c4aaa93088 Mon Sep 17 00:00:00 2001
From: Bryce Allen <bdallen@uchicago.edu>
Date: Sat, 23 Sep 2023 09:28:59 -0400
Subject: [PATCH] cub: add flaps, fm on 6pos

---
 model02.yml | 455 ++++++++++++----------------------------------------
 1 file changed, 105 insertions(+), 350 deletions(-)

diff --git a/model02.yml b/model02.yml
index 314c41a..7889b72 100644
--- a/model02.yml
+++ b/model02.yml
@@ -5,7 +5,7 @@ header:
   labels: ""
   modelId:
     0:
-      val: 1
+      val: 7
 timers:
   0:
     swtch: NONE
@@ -32,6 +32,30 @@ beepANACenter: 0
 extendedLimits: 0
 extendedTrims: 0
 throttleReversed: 0
+flightModeData:
+  0:
+    name: BEG
+    fadeIn: 0
+    fadeOut: 0
+    gvars:
+      0:
+        val: 100
+  1:
+    swtch: 6P21
+    name: INT
+    fadeIn: 0
+    fadeOut: 0
+    gvars:
+      0:
+        val: 0
+  2:
+    swtch: 6P22
+    name: ADV
+    fadeIn: 0
+    fadeOut: 0
+    gvars:
+      0:
+        val: -100
 mixData:
   - destCh: 0
     srcRaw: I0
@@ -50,23 +74,6 @@ mixData:
     flightModes: 000000000
     offset: 0
     name: ""
-  - destCh: 0
-    srcRaw: tr(0)
-    weight: 100
-    swtch: SE2
-    curve:
-      type: 0
-      value: 0
-    delayUp: 0
-    delayDown: 0
-    speedUp: 0
-    speedDown: 0
-    carryTrim: 0
-    mltpx: REPL
-    mixWarn: 0
-    flightModes: 000000000
-    offset: 0
-    name: ""
   - destCh: 1
     srcRaw: I1
     weight: 100
@@ -85,21 +92,21 @@ mixData:
     offset: 0
     name: ""
   - destCh: 1
-    srcRaw: tr(1)
-    weight: 100
-    swtch: SE2
+    srcRaw: I7
+    weight: 20
+    swtch: NONE
     curve:
       type: 0
       value: 0
     delayUp: 0
     delayDown: 0
-    speedUp: 0
-    speedDown: 0
+    speedUp: 15
+    speedDown: 15
     carryTrim: 0
-    mltpx: REPL
+    mltpx: ADD
     mixWarn: 0
     flightModes: 000000000
-    offset: 0
+    offset: 20
     name: ""
   - destCh: 2
     srcRaw: I2
@@ -118,23 +125,6 @@ mixData:
     flightModes: 000000000
     offset: 0
     name: ""
-  - destCh: 2
-    srcRaw: tr(2)
-    weight: 100
-    swtch: SE2
-    curve:
-      type: 0
-      value: 0
-    delayUp: 0
-    delayDown: 0
-    speedUp: 0
-    speedDown: 0
-    carryTrim: 0
-    mltpx: REPL
-    mixWarn: 0
-    flightModes: 000000000
-    offset: 0
-    name: ""
   - destCh: 2
     srcRaw: MAX
     weight: -100
@@ -169,10 +159,10 @@ mixData:
     flightModes: 000000000
     offset: 0
     name: ""
-  - destCh: 3
-    srcRaw: tr(3)
+  - destCh: 4
+    srcRaw: I4
     weight: 100
-    swtch: SE2
+    swtch: NONE
     curve:
       type: 0
       value: 0
@@ -181,13 +171,13 @@ mixData:
     speedUp: 0
     speedDown: 0
     carryTrim: 0
-    mltpx: REPL
+    mltpx: ADD
     mixWarn: 0
     flightModes: 000000000
     offset: 0
     name: ""
-  - destCh: 4
-    srcRaw: I4
+  - destCh: 5
+    srcRaw: I5
     weight: 100
     swtch: NONE
     curve:
@@ -202,9 +192,9 @@ mixData:
     mixWarn: 0
     flightModes: 000000000
     offset: 0
-    name: ""
-  - destCh: 5
-    srcRaw: I5
+    name: Panic
+  - destCh: 6
+    srcRaw: I7
     weight: 100
     swtch: NONE
     curve:
@@ -212,14 +202,14 @@ mixData:
       value: 0
     delayUp: 0
     delayDown: 0
-    speedUp: 0
-    speedDown: 0
+    speedUp: 15
+    speedDown: 15
     carryTrim: 0
     mltpx: ADD
     mixWarn: 0
     flightModes: 000000000
     offset: 0
-    name: Panic
+    name: FLP
 limitData:
   0:
     min: 0
@@ -406,14 +396,14 @@ expoData:
       value: 0
     trimSource: 0
     name: Low
-  - srcRaw: SB
+  - srcRaw: MAX
     scale: 0
     mode: 3
     chn: 4
     swtch: NONE
     flightModes: 000000000
-    weight: 100
-    offset: 0
+    weight: 0
+    offset: GV1
     curve:
       type: 0
       value: 0
@@ -445,6 +435,19 @@ expoData:
       value: 0
     trimSource: 0
     name: ""
+  - srcRaw: SB
+    scale: 0
+    mode: 3
+    chn: 7
+    swtch: NONE
+    flightModes: 000000000
+    weight: 100
+    offset: 0
+    curve:
+      type: 1
+      value: 0
+    trimSource: 0
+    name: ""
 inputNames:
   0:
     val: Ail
@@ -460,6 +463,8 @@ inputNames:
     val: Pan
   6:
     val: Cut
+  7:
+    val: FLP
 customFn:
   0:
     swtch: SD2
@@ -470,15 +475,15 @@ customFn:
     func: PLAY_TRACK
     def: thract,1x
   2:
-    swtch: SB0
+    swtch: 6P22
     func: PLAY_TRACK
     def: 3d-mod,!1x
   3:
-    swtch: SB1
+    swtch: 6P21
     func: PLAY_TRACK
     def: stabmo,!1x
   4:
-    swtch: SB2
+    swtch: 6P20
     func: PLAY_TRACK
     def: safeon,!1x
   5:
@@ -505,6 +510,22 @@ customFn:
     swtch: SE0
     func: PLAY_TRACK
     def: trnoff,!1x
+  13:
+    swtch: SB0
+    func: PLAY_TRACK
+    def: flapup,!1x
+  14:
+    swtch: SB1
+    func: PLAY_TRACK
+    def: flapdn,1x
+  15:
+    swtch: SB2
+    func: PLAY_TRACK
+    def: flapdn,1x
+  16:
+    swtch: SB2
+    func: PLAY_TRACK
+    def: lnding,1x
 swashR:
   type: TYPE_NONE
   value: 0
@@ -607,13 +628,13 @@ telemetrySensors:
   1:
     type: TYPE_CUSTOM
     id1:
-      id: 17153
+      id: 4608
     subId: 0
     id2:
       instance: 0
-    label: BTmp
-    unit: 11
-    prec: 0
+    label: Alt
+    unit: 10
+    prec: 1
     autoOffset: 0
     filter: 0
     logs: 1
@@ -626,13 +647,13 @@ telemetrySensors:
   2:
     type: TYPE_CUSTOM
     id1:
-      id: 17154
+      id: 32512
     subId: 0
     id2:
       instance: 0
-    label: Cel1
-    unit: 1
-    prec: 2
+    label: FdeA
+    unit: 0
+    prec: 0
     autoOffset: 0
     filter: 0
     logs: 1
@@ -645,49 +666,11 @@ telemetrySensors:
   3:
     type: TYPE_CUSTOM
     id1:
-      id: 17156
-    subId: 0
-    id2:
-      instance: 0
-    label: Cel2
-    unit: 1
-    prec: 2
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  4:
-    type: TYPE_CUSTOM
-    id1:
-      id: 17158
-    subId: 0
-    id2:
-      instance: 0
-    label: Cel3
-    unit: 1
-    prec: 2
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  5:
-    type: TYPE_CUSTOM
-    id1:
-      id: 32512
+      id: 32520
     subId: 0
     id2:
       instance: 0
-    label: FdeA
+    label: FLss
     unit: 0
     prec: 0
     autoOffset: 0
@@ -699,14 +682,14 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  6:
+  4:
     type: TYPE_CUSTOM
     id1:
-      id: 32520
+      id: 32522
     subId: 0
     id2:
       instance: 0
-    label: FLss
+    label: Hold
     unit: 0
     prec: 0
     autoOffset: 0
@@ -718,15 +701,15 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  7:
+  5:
     type: TYPE_CUSTOM
     id1:
-      id: 32522
+      id: 4352
     subId: 0
     id2:
       instance: 0
-    label: Hold
-    unit: 0
+    label: ASpd
+    unit: 7
     prec: 0
     autoOffset: 0
     filter: 0
@@ -737,7 +720,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  8:
+  6:
     type: TYPE_CUSTOM
     id1:
       id: 31488
@@ -756,7 +739,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  9:
+  7:
     type: TYPE_CUSTOM
     id1:
       id: 31490
@@ -775,7 +758,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  10:
+  8:
     type: TYPE_CUSTOM
     id1:
       id: 31492
@@ -794,7 +777,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  11:
+  9:
     type: TYPE_CUSTOM
     id1:
       id: 31494
@@ -813,7 +796,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  12:
+  10:
     type: TYPE_CUSTOM
     id1:
       id: 31496
@@ -832,7 +815,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  13:
+  11:
     type: TYPE_CUSTOM
     id1:
       id: 31498
@@ -851,7 +834,7 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  14:
+  12:
     type: TYPE_CUSTOM
     id1:
       id: 31500
@@ -870,234 +853,6 @@ telemetrySensors:
       custom:
         ratio: 0
         offset: 0
-  15:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8192
-    subId: 0
-    id2:
-      instance: 0
-    label: Erpm
-    unit: 18
-    prec: 0
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 1
-        offset: 1
-  16:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8194
-    subId: 0
-    id2:
-      instance: 0
-    label: EVIN
-    unit: 1
-    prec: 2
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  17:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8196
-    subId: 0
-    id2:
-      instance: 0
-    label: TFET
-    unit: 11
-    prec: 1
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  18:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8198
-    subId: 0
-    id2:
-      instance: 0
-    label: ECUR
-    unit: 2
-    prec: 2
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  19:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8200
-    subId: 0
-    id2:
-      instance: 0
-    label: TBEC
-    unit: 11
-    prec: 1
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  20:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8202
-    subId: 0
-    id2:
-      instance: 0
-    label: CBEC
-    unit: 2
-    prec: 1
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  21:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8203
-    subId: 0
-    id2:
-      instance: 0
-    label: VBEC
-    unit: 1
-    prec: 2
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  22:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8204
-    subId: 0
-    id2:
-      instance: 0
-    label: ETHR
-    unit: 13
-    prec: 0
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  23:
-    type: TYPE_CUSTOM
-    id1:
-      id: 8205
-    subId: 0
-    id2:
-      instance: 0
-    label: EOUT
-    unit: 13
-    prec: 0
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  24:
-    type: TYPE_CUSTOM
-    id1:
-      id: 4608
-    subId: 0
-    id2:
-      instance: 0
-    label: Alt
-    unit: 9
-    prec: 1
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  25:
-    type: TYPE_CUSTOM
-    id1:
-      id: 4352
-    subId: 0
-    id2:
-      instance: 0
-    label: ASpd
-    unit: 7
-    prec: 0
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
-  26:
-    type: TYPE_CUSTOM
-    id1:
-      id: 18948
-    subId: 0
-    id2:
-      instance: 0
-    label: Cycl
-    unit: 0
-    prec: 0
-    autoOffset: 0
-    filter: 0
-    logs: 1
-    persistent: 0
-    onlyPositive: 0
-    cfg:
-      custom:
-        ratio: 0
-        offset: 0
 modelRegistrationID: " 692XAP-"
 usbJoystickExtMode: 0
 usbJoystickIfMode: JOYSTICK