misc fixes, churn

This commit is contained in:
Bryce Allen
2024-02-02 16:20:39 -05:00
parent 74664387dd
commit dbaf47f60f
15 changed files with 15155 additions and 14938 deletions
+802 -661
View File
File diff suppressed because it is too large Load Diff
+742 -783
View File
File diff suppressed because it is too large Load Diff
+1065 -1113
View File
File diff suppressed because it is too large Load Diff
+625 -639
View File
File diff suppressed because it is too large Load Diff
+660 -686
View File
File diff suppressed because it is too large Load Diff
+1313 -1331
View File
File diff suppressed because it is too large Load Diff
+962 -1023
View File
File diff suppressed because it is too large Load Diff
+1064 -1114
View File
File diff suppressed because it is too large Load Diff
+1361 -1078
View File
File diff suppressed because it is too large Load Diff
+882 -721
View File
File diff suppressed because it is too large Load Diff
+393 -430
View File
File diff suppressed because it is too large Load Diff
+634 -657
View File
File diff suppressed because it is too large Load Diff
+559 -583
View File
File diff suppressed because it is too large Load Diff
+721 -743
View File
File diff suppressed because it is too large Load Diff
+283 -287
View File
@@ -1,90 +1,36 @@
semver: 2.9.2
semver: 2.9.1
header:
name: Q33
bitmap: ""
labels: ""
name: "Q33"
modelId:
0:
val: 1
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:
2:
value: 0
mode: 31
3:
value: 6
mode: 0
name: High
fadeIn: 0
fadeOut: 0
gvars:
1:
val: 75
2:
val: 25
3:
val: 50
4:
val: 25
1:
trim:
2:
value: 0
mode: 31
swtch: 6P21
name: Mid
fadeIn: 0
fadeOut: 0
gvars:
0:
val: 1
1:
val: 75
2:
val: 20
3:
val: 50
4:
val: 20
2:
trim:
2:
value: 0
mode: 31
swtch: 6P22
name: Low
fadeIn: 0
fadeOut: 0
gvars:
0:
val: 2
1:
val: 90
2:
val: 20
3:
val: 75
4:
val: 20
enableCustomThrottleWarning: 0
disableTelemetryWarning: 0
showInstanceIds: 0
customThrottleWarningPosition: 0
beepANACenter: 0
mixData:
- destCh: 0
-
weight: GV2
destCh: 0
srcRaw: I0
weight: GV2
swtch: SE0
carryTrim: 0
mixWarn: 0
mltpx: ADD
offset: 0
swtch: "SE0"
flightModes: 000000000
curve:
type: 1
value: GV3
@@ -92,16 +38,17 @@ mixData:
delayDown: 0
speedUp: 0
speedDown: 0
carryTrim: 0
mltpx: ADD
mixWarn: 0
flightModes: 000000000
offset: 0
name: ""
- destCh: 0
-
weight: GV2
destCh: 0
srcRaw: I3
weight: GV2
swtch: SE2
carryTrim: 0
mixWarn: 0
mltpx: REPL
offset: 0
swtch: "SE2"
flightModes: 000000000
curve:
type: 1
value: GV3
@@ -109,33 +56,17 @@ mixData:
delayDown: 0
speedUp: 0
speedDown: 0
carryTrim: 0
mltpx: ADD
mixWarn: 0
flightModes: 000000000
offset: 0
name: Rud
- destCh: 1
name: "Rud"
-
weight: GV4
destCh: 1
srcRaw: I1
weight: GV4
swtch: SE0
curve:
type: 1
value: GV5
delayUp: 0
delayDown: 0
speedUp: 0
speedDown: 0
carryTrim: 0
mixWarn: 0
mltpx: ADD
mixWarn: 0
flightModes: 000000000
offset: 0
name: ""
- destCh: 1
srcRaw: I2
weight: GV4
swtch: SE2
swtch: "SE0"
flightModes: 000000000
curve:
type: 1
value: GV5
@@ -143,187 +74,183 @@ mixData:
delayDown: 0
speedUp: 0
speedDown: 0
name: ""
-
weight: GV4
destCh: 1
srcRaw: I2
carryTrim: 0
mltpx: REPL
mixWarn: 0
flightModes: 000000000
mltpx: REPL
offset: 0
swtch: "SE2"
flightModes: 000000000
curve:
type: 1
value: GV5
delayUp: 0
delayDown: 0
speedUp: 0
speedDown: 0
name: ""
limitData:
0:
min: 0
max: 0
revert: 1
offset: 0
ppmCenter: 0
offset: 0
symetrical: 0
name: Str
revert: 1
curve: 0
name: "Str"
1:
min: 0
max: 0
revert: 0
offset: 0
ppmCenter: 0
offset: 0
symetrical: 0
name: Thr
revert: 0
curve: 0
name: "Thr"
expoData:
- srcRaw: Ail
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: Ail
chn: 0
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
name: ""
offset: 0
curve:
type: 1
value: 20
trimSource: 0
name: ""
- srcRaw: Thr
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: Thr
chn: 1
swtch: "!L11"
flightModes: 000000000
weight: 50
offset: 50
curve:
type: 0
value: 0
trimSource: 0
name: ""
- srcRaw: Thr
scale: 0
offset: 50
-
mode: 3
scale: 0
trimSource: 0
srcRaw: Thr
chn: 1
swtch: L11
swtch: "L11"
flightModes: 000000000
weight: -50
name: ""
offset: -50
curve:
type: 0
value: 0
trimSource: 0
name: ""
- srcRaw: Ele
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: Ele
chn: 2
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
offset: 0
curve:
type: 0
value: 0
trimSource: 0
name: ""
- srcRaw: Rud
scale: 0
offset: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: Rud
chn: 3
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
name: ""
offset: 0
curve:
type: 1
value: 20
trimSource: 0
name: ""
- srcRaw: SC
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: SC
chn: 4
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
name: ""
offset: 0
curve:
type: 3
value: 1
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: 3
value: 2
trimSource: 0
name: ""
- srcRaw: POT1
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: POT1
chn: 6
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
name: ""
offset: 0
curve:
type: 3
value: 4
trimSource: 0
name: ""
- srcRaw: POT2
scale: 0
-
mode: 3
scale: 0
trimSource: 0
srcRaw: POT2
chn: 7
swtch: NONE
swtch: "NONE"
flightModes: 000000000
weight: 100
name: ""
offset: 0
curve:
type: 3
value: 3
trimSource: 0
name: ""
inputNames:
0:
val: StA
1:
val: ThT
2:
val: ThE
3:
val: StR
4:
val: SRT
5:
val: TRT
6:
val: TEP
7:
val: SEP
curves:
0:
type: 0
smooth: 0
points: -2
name: SRT
name: "SRT"
1:
type: 0
smooth: 0
points: -2
name: TRT
name: "TRT"
2:
type: 0
smooth: 0
points: -2
name: SEP
name: "SEP"
3:
type: 0
smooth: 0
points: -2
name: TEP
name: "TEP"
points:
0:
val: 100
@@ -337,14 +264,10 @@ points:
val: 75
5:
val: 50
6:
val: 0
7:
val: 25
8:
val: 50
9:
val: 0
10:
val: 25
11:
@@ -352,136 +275,188 @@ points:
logicalSw:
0:
func: FUNC_ANEG
def: I1,2
def: "I1,2"
andsw: "SD0"
delay: 0
duration: 0
andsw: SD0
1:
func: FUNC_STICKY
def: L1,SD2
def: "L1,SD2"
andsw: "NONE"
delay: 0
duration: 0
andsw: NONE
8:
func: FUNC_ANEG
def: I1,2
def: "I1,2"
andsw: "SA2"
delay: 0
duration: 0
andsw: SA2
9:
func: FUNC_ANEG
def: I1,2
def: "I1,2"
andsw: "SA0"
delay: 0
duration: 0
andsw: SA0
10:
func: FUNC_STICKY
def: L9,L10
def: "L9,L10"
andsw: "NONE"
delay: 0
duration: 0
andsw: NONE
customFn:
0:
swtch: "!L2"
func: OVERRIDE_CHANNEL
def: 1,0,1
def: "1,0,1"
1:
swtch: "!L2"
func: PLAY_TRACK
def: thrcut,1x
def: "thrcut,1x"
2:
swtch: L2
swtch: "L2"
func: PLAY_TRACK
def: thract,1x
def: "thract,1x"
4:
swtch: ON
swtch: "ON"
func: ADJUST_GVAR
def: 2,Src,I7,1
def: "2,Src,I7,1"
5:
swtch: ON
swtch: "ON"
func: ADJUST_GVAR
def: 4,Src,I6,1
def: "4,Src,I6,1"
6:
swtch: ON
swtch: "ON"
func: ADJUST_GVAR
def: 3,Src,I5,1
def: "3,Src,I5,1"
7:
swtch: ON
swtch: "ON"
func: ADJUST_GVAR
def: 1,Src,I4,1
def: "1,Src,I4,1"
9:
swtch: "!L11"
func: PLAY_TRACK
def: gearup,1x
def: "gearup,1x"
10:
swtch: L11
swtch: "L11"
func: PLAY_TRACK
def: geardn,1x
swashR:
type: TYPE_NONE
def: "geardn,1x"
flightModeData:
0:
trim:
2:
value: 0
collectiveSource: NONE
aileronSource: NONE
elevatorSource: NONE
collectiveWeight: 0
aileronWeight: 0
elevatorWeight: 0
thrTraceSrc: Thr
switchWarningState: AuDd
thrTrimSw: 0
potsWarnMode: WARN_OFF
jitterFilter: GLOBAL
potsWarnEnabled: 0
displayChecklist: 0
mode: 31
3:
value: 6
mode: 0
name: "High"
swtch: "NONE"
fadeIn: 0
fadeOut: 0
gvars:
0:
name: FM
val: 0
1:
val: 100
2:
val: 25
3:
val: 100
4:
val: 25
5:
val: 0
6:
val: 0
7:
val: 0
8:
val: 0
1:
trim:
2:
value: 0
mode: 31
name: "Mid"
swtch: "6P21"
fadeIn: 0
fadeOut: 0
gvars:
0:
val: 1
1:
val: 75
2:
val: 20
3:
val: 50
4:
val: 20
2:
trim:
2:
value: 0
mode: 31
name: "Low"
swtch: "6P22"
fadeIn: 0
fadeOut: 0
gvars:
0:
val: 2
1:
val: 90
2:
val: 20
3:
val: 75
4:
val: 20
thrTraceSrc: Thr
switchWarningState: AuDd
gvars:
0:
name: "FM"
min: 0
max: 0
popup: 0
prec: 0
unit: 0
1:
name: SRT
name: "SRT"
min: 0
max: 0
popup: 0
prec: 0
unit: 0
2:
name: SEP
name: "SEP"
min: 0
max: 0
popup: 0
prec: 0
unit: 0
3:
name: TRT
name: "TRT"
min: 0
max: 0
popup: 0
prec: 0
unit: 0
4:
name: TEP
name: "TEP"
min: 0
max: 0
popup: 0
prec: 0
unit: 0
telemetryProtocol: 0
varioData:
source: none
centerSilent: 0
centerMax: 0
centerMin: 0
min: 0
max: 0
rssiSource: none
rfAlarms:
warning: 45
critical: 42
disableTelemetryWarning: 0
thrTrimSw: 0
potsWarnMode: WARN_OFF
jitterFilter: GLOBAL
moduleData:
0:
type: TYPE_MULTIMODULE
@@ -495,6 +470,8 @@ moduleData:
disableMapping: 0
autoBindMode: 0
lowPowerMode: 0
receiverTelemetryOff: 0
receiverHigherChannels: 0
optionValue: 0
trainerData:
mode: MASTER_TRAINER_JACK
@@ -503,15 +480,33 @@ trainerData:
frameLength: 0
delay: 0
pulsePol: 0
inputNames:
0:
val: "StA"
1:
val: "ThT"
2:
val: "ThE"
3:
val: "StR"
4:
val: "SRT"
5:
val: "TRT"
6:
val: "TEP"
7:
val: "SEP"
potsWarnEnabled: 0
telemetrySensors:
0:
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
@@ -524,13 +519,13 @@ telemetrySensors:
ratio: 0
offset: 0
1:
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
@@ -543,13 +538,13 @@ telemetrySensors:
ratio: 0
offset: 0
2:
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
@@ -562,13 +557,13 @@ telemetrySensors:
ratio: 0
offset: 0
3:
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
@@ -581,13 +576,13 @@ telemetrySensors:
ratio: 0
offset: 0
4:
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
@@ -600,13 +595,13 @@ telemetrySensors:
ratio: 0
offset: 0
5:
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
@@ -619,13 +614,13 @@ telemetrySensors:
ratio: 0
offset: 0
6:
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
@@ -638,13 +633,13 @@ telemetrySensors:
ratio: 0
offset: 0
7:
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
@@ -657,13 +652,13 @@ telemetrySensors:
ratio: 0
offset: 0
8:
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
@@ -676,13 +671,13 @@ telemetrySensors:
ratio: 0
offset: 0
9:
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
@@ -695,13 +690,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
@@ -714,13 +709,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
@@ -733,13 +728,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
@@ -752,13 +747,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
@@ -770,6 +765,7 @@ telemetrySensors:
custom:
ratio: 0
offset: 0
view: 0
modelRegistrationID: " 692XAP-"
usbJoystickExtMode: 0
usbJoystickIfMode: JOYSTICK