Skip to content

Commit 797324c

Browse files
authored
Merge pull request #141 from McGiverGim/fix_anti_gravity_gain_header
Fix antigravity field value
2 parents ac2815d + 734d68a commit 797324c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

js/flightlog_parser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ var FlightLogParser = function(logData) {
548548
case "dtermSetpointWeight":
549549
case "gyro_soft_type":
550550
case "debug_mode":
551+
case "anti_gravity_gain":
551552
that.sysConfig[fieldName] = parseInt(fieldValue, 10);
552553
break;
553554

@@ -567,8 +568,7 @@ var FlightLogParser = function(logData) {
567568
break
568569

569570
case "yawRateAccelLimit":
570-
case "rateAccelLimit":
571-
case "anti_gravity_gain":
571+
case "rateAccelLimit":
572572
if((that.sysConfig.firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(that.sysConfig.firmwareVersion, '3.1.0')) ||
573573
(that.sysConfig.firmwareType == FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(that.sysConfig.firmwareVersion, '2.0.0'))) {
574574
that.sysConfig[fieldName] = parseInt(fieldValue, 10)/1000;

js/header_dialog.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,12 @@ function HeaderDialog(dialog, onSave) {
527527
setParameter('motorOutputLow' ,sysConfig.motorOutput[0],0);
528528
setParameter('motorOutputHigh' ,sysConfig.motorOutput[1],0);
529529
setParameter('digitalIdleOffset' ,sysConfig.digitalIdleOffset,2);
530-
setParameter('antiGravityGain' ,sysConfig.anti_gravity_gain,0);
530+
if((activeSysConfig.firmwareType == FIRMWARE_TYPE_BETAFLIGHT && semver.gte(activeSysConfig.firmwareVersion, '3.1.0')) ||
531+
(activeSysConfig.firmwareType == FIRMWARE_TYPE_CLEANFLIGHT && semver.gte(activeSysConfig.firmwareVersion, '2.0.0'))) {
532+
setParameter('antiGravityGain' ,sysConfig.anti_gravity_gain,3);
533+
} else {
534+
setParameter('antiGravityGain' ,sysConfig.anti_gravity_gain,0);
535+
}
531536
setParameter('antiGravityThreshold' ,sysConfig.anti_gravity_threshold,0);
532537
setParameter('setpointRelaxRatio' ,sysConfig.setpointRelaxRatio,2);
533538
setParameter('pidSumLimit' ,sysConfig.pidSumLimit,0);

0 commit comments

Comments
 (0)