From b8d061c18f11dd4a242e24f5ad5ea1f16dd8d6af Mon Sep 17 00:00:00 2001 From: Bryce Allen Date: Sat, 2 Dec 2023 12:20:22 -0500 Subject: [PATCH] GemEagle: use safe mode for rescue --- boxer/model20.yml | 209 ++++++++++++++++++++++------------------------ 1 file changed, 102 insertions(+), 107 deletions(-) diff --git a/boxer/model20.yml b/boxer/model20.yml index 88a442a..91df8a0 100644 --- a/boxer/model20.yml +++ b/boxer/model20.yml @@ -1,4 +1,4 @@ -semver: 2.9.1 +semver: 2.9.2 header: name: GemEagle bitmap: "" @@ -35,15 +35,18 @@ throttleReversed: 0 flightModeData: 0: trim: + 1: + value: -42 + mode: 0 2: value: 0 mode: 31 - name: Begin + name: Manual fadeIn: 0 fadeOut: 0 gvars: 0: - val: -100 + val: -80 1: val: 75 2: @@ -58,7 +61,7 @@ flightModeData: value: 0 mode: 2 1: - value: 0 + value: -84 mode: 2 2: value: 0 @@ -67,19 +70,19 @@ flightModeData: value: 0 mode: 2 swtch: 6P21 - name: Mid + name: Launch fadeIn: 0 fadeOut: 0 gvars: 0: - val: 0 + val: -40 2: trim: 0: value: 0 mode: 4 1: - value: 92 + value: -48 mode: 4 2: value: 0 @@ -88,42 +91,64 @@ flightModeData: value: 0 mode: 4 swtch: 6P22 - name: Expert + name: Safe fadeIn: 0 fadeOut: 0 gvars: 0: - val: 100 + val: 0 3: trim: + 0: + value: 0 + mode: 6 + 1: + value: -58 + mode: 6 2: value: 0 mode: 31 + 3: + value: 0 + mode: 6 swtch: 6P23 - name: TrA + name: Level fadeIn: 0 fadeOut: 0 gvars: + 0: + val: 40 3: val: 1 4: - val: 100 + val: 70 7: val: 1 4: trim: + 0: + value: 0 + mode: 8 + 1: + value: 0 + mode: 8 2: value: 0 mode: 31 + 3: + value: 0 + mode: 8 swtch: 6P24 - name: Manual + name: Hover fadeIn: 0 fadeOut: 0 gvars: + 0: + val: 80 3: val: 2 4: - val: 70 + val: 100 7: val: 2 5: @@ -131,8 +156,8 @@ flightModeData: 2: value: 0 mode: 31 - swtch: 6P25 - name: TrAETR + swtch: NONE + name: "" fadeIn: 0 fadeOut: 0 gvars: @@ -259,14 +284,14 @@ mixData: delayDown: 0 speedUp: 0 speedDown: 0 - carryTrim: 0 + carryTrim: 1 mltpx: ADD mixWarn: 0 flightModes: 000000000 offset: 0 name: FM - destCh: 5 - srcRaw: I5 + srcRaw: POT1 weight: 100 swtch: NONE curve: @@ -281,7 +306,7 @@ mixData: mixWarn: 0 flightModes: 000000000 offset: 0 - name: Cal + name: Gain - destCh: 6 srcRaw: I6 weight: 100 @@ -298,7 +323,7 @@ mixData: mixWarn: 0 flightModes: 000000000 offset: 0 - name: Flp + name: "" - destCh: 19 srcRaw: Ail weight: 100 @@ -539,34 +564,7 @@ limitData: offset: 0 ppmCenter: 0 symetrical: 0 - name: Cal - curve: 0 - 6: - min: 0 - max: 0 - revert: 0 - offset: 0 - ppmCenter: 0 - symetrical: 0 - name: Flip - curve: 0 - 7: - min: 0 - max: 0 - revert: 0 - offset: 0 - ppmCenter: 0 - symetrical: 0 - name: RACT - curve: 0 - 8: - min: 0 - max: 0 - revert: 0 - offset: 0 - ppmCenter: 0 - symetrical: 0 - name: RTN + name: Gain curve: 0 19: min: 0 @@ -744,46 +742,33 @@ expoData: value: GV3 trimSource: -1 name: "" - - srcRaw: POT3 + - srcRaw: MAX scale: 0 mode: 3 chn: 4 swtch: NONE flightModes: 000000000 - weight: 100 - offset: 0 + weight: 0 + offset: GV1 curve: - type: 1 + type: 0 value: 0 trimSource: 0 name: "" - - srcRaw: MAX + - srcRaw: POT1 scale: 0 mode: 3 chn: 5 - swtch: L12 + swtch: NONE flightModes: 000000000 weight: 100 offset: 0 curve: - type: 0 - value: 0 - trimSource: 0 - name: On - - srcRaw: MAX - scale: 0 - mode: 3 - chn: 5 - swtch: "!L12" - flightModes: 000000000 - weight: -100 - offset: 0 - curve: - type: 0 + type: 1 value: 0 trimSource: 0 - name: Off - - srcRaw: SE + name: "" + - srcRaw: SA scale: 0 mode: 3 chn: 6 @@ -792,7 +777,7 @@ expoData: weight: 100 offset: 0 curve: - type: 0 + type: 1 value: 0 trimSource: 0 name: "" @@ -870,10 +855,12 @@ inputNames: val: Thr 3: val: Rud + 4: + val: FM 5: - val: Cal + val: GN 6: - val: Flp + val: Rev 9: val: Tlv 19: @@ -1057,132 +1044,140 @@ customFn: 2: swtch: 6P20 func: PLAY_TRACK - def: fm-stb,!1x + def: manmod,!1x 3: swtch: 6P21 func: PLAY_TRACK - def: fm-crs,1x + def: fm-lch,1x 4: swtch: 6P22 func: PLAY_TRACK - def: fm-acr,1x + def: safeon,1x 5: + swtch: 6P23 + func: PLAY_TRACK + def: fm-stb,1x + 6: + swtch: 6P24 + func: PLAY_TRACK + def: fm-flt,1x + 7: swtch: L5 func: PLAY_TRACK def: trnon,1x - 6: + 8: swtch: L5 func: PLAY_VALUE def: gv(3),1x - 7: + 9: swtch: "!L5" func: PLAY_TRACK def: trnoff,!1x - 8: + 10: swtch: L7 func: ADJUST_GVAR def: 3,Cst,-1,1 - 9: + 11: swtch: L8 func: ADJUST_GVAR def: 3,Src,I9,1 - 11: + 13: swtch: SF2 func: OVERRIDE_CHANNEL - def: 4,-100,1 - 12: + def: 4,0,1 + 14: swtch: SF2 func: PLAY_TRACK - def: sftyon,1x - 20: + def: safeon,1x + 22: swtch: ON func: ADJUST_GVAR def: 1,Src,I19,1 - 21: + 23: swtch: ON func: ADJUST_GVAR def: 2,Src,I20,1 - 22: + 24: swtch: ON func: ADJUST_GVAR def: 4,Src,I21,1 - 24: + 26: swtch: TrimThrUp func: PLAY_SOUND def: Bp1,1 - 25: + 27: swtch: L12 func: PLAY_TRACK def: hdadj,1x - 26: + 28: swtch: L11 func: RESET def: Tmr1,1 - 27: + 29: swtch: L11 func: PLAY_TRACK def: timrs1,1x - 31: + 33: swtch: SC0 func: PLAY_TRACK def: rathi,!1x - 32: + 34: swtch: SC1 func: PLAY_TRACK def: ratmed,1x - 33: + 35: swtch: SC2 func: PLAY_TRACK def: ratmod,1x - 35: + 37: swtch: SB0 func: PLAY_VALUE def: gv(4),!1x - 36: + 38: swtch: SB1 func: PLAY_VALUE def: gv(4),!1x - 37: + 39: swtch: SB2 func: PLAY_VALUE def: gv(4),!1x - 39: + 41: swtch: TrimThrDown func: PLAY_SOUND def: Bp3,1 - 40: + 42: swtch: L15 func: PLAY_TRACK def: ratmod,1x - 41: + 43: swtch: L15 func: PLAY_VALUE def: gv(1),1x - 42: + 44: swtch: L15 func: PLAY_VALUE def: gv(2),1x - 43: + 45: swtch: L16 func: PLAY_VALUE def: gv(3),1x - 45: + 47: swtch: ON func: BACKLIGHT def: I27,1 - 46: + 48: swtch: L10 func: ADJUST_GVAR def: 6,IncDec,10,1 - 47: + 49: swtch: L14 func: ADJUST_GVAR def: 6,IncDec,-10,1 - 48: + 50: swtch: L13 func: PLAY_TRACK def: osd,1x - 49: + 51: swtch: L13 func: PLAY_VALUE def: gv(6),1x @@ -1196,7 +1191,7 @@ swashR: aileronWeight: 0 elevatorWeight: 0 thrTraceSrc: ch(2) -switchWarningState: AuDdEu +switchWarningState: Dd thrTrimSw: 0 potsWarnMode: WARN_OFF jitterFilter: GLOBAL