Skip to content

Commit ea36b0b

Browse files
committed
support angle_mode debug and two tests
1 parent b88fb7f commit ea36b0b

File tree

3 files changed

+105
-0
lines changed

3 files changed

+105
-0
lines changed

js/flightlog_fielddefs.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ let
349349
"ATTITUDE",
350350
"VTX_MSP",
351351
"GPS_DOP",
352+
"ANGLE_MODE",
353+
"ANGLE_TEST1",
354+
"ANGLE_TEST2",
352355
]),
353356

354357
SUPER_EXPO_YAW = makeReadOnly([

js/flightlog_fields_presenter.js

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,27 @@ function FlightLogFieldPresenter() {
690690
'debug[2]': 'hDOP (horizontal - 2D)',
691691
'debug[3]': 'vDOP (vertical - 1D)',
692692
},
693+
'ANGLE_MODE' : {
694+
'debug[all]': 'Angle Mode',
695+
'debug[0]': 'Target angle',
696+
'debug[1]': 'Error P correction',
697+
'debug[2]': 'Feedforward correction',
698+
'debug[3]': 'Angle achieved',
699+
},
700+
'ANGLE_TEST1' : {
701+
'debug[all]': 'Angle Mode 1',
702+
'debug[0]': 'Value 1',
703+
'debug[1]': 'Value 2',
704+
'debug[2]': 'Value 3',
705+
'debug[3]': 'Value 4',
706+
},
707+
'ANGLE_TEST2' : {
708+
'debug[all]': 'Angle Mode debug 2',
709+
'debug[0]': 'Value 1',
710+
'debug[1]': 'Value 2',
711+
'debug[2]': 'Value 3',
712+
'debug[3]': 'Value 4',
713+
},
693714
};
694715

695716
let DEBUG_FRIENDLY_FIELD_NAMES = null;
@@ -1354,6 +1375,36 @@ function FlightLogFieldPresenter() {
13541375
default:
13551376
return (value / 100).toFixed(2);
13561377
}
1378+
case 'ANGLE_MODE':
1379+
switch (fieldName) {
1380+
case 'debug[0]': // target angle
1381+
case 'debug[1]': // angle error
1382+
case 'debug[2]': // angle feedforward
1383+
case 'debug[3]': // angle achieved
1384+
return (value / 10).toFixed(1) + " °";
1385+
default:
1386+
return value.toFixed(0);
1387+
}
1388+
case 'ANGLE_TEST1':
1389+
switch (fieldName) {
1390+
case 'debug[0]': // ?
1391+
case 'debug[1]': // ?
1392+
case 'debug[2]': // ?
1393+
case 'debug[3]': // ?
1394+
return (value / 10).toFixed(1) + " °";
1395+
default:
1396+
return value.toFixed(0);
1397+
}
1398+
case 'ANGLE_TEST2':
1399+
switch (fieldName) {
1400+
case 'debug[0]': // ?
1401+
case 'debug[1]': // ?
1402+
case 'debug[2]': // ?
1403+
case 'debug[3]': // ?
1404+
return (value / 10).toFixed(1) + " °";
1405+
default:
1406+
return value.toFixed(0);
1407+
}
13571408
}
13581409
return value.toFixed(0);
13591410
}

js/graph_config.js

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,57 @@ GraphConfig.load = function(config) {
931931
default:
932932
return getCurveForMinMaxFields(fieldName);
933933
}
934+
case 'ANGLE_MODE':
935+
switch (fieldName) {
936+
case 'debug[0]': // angle target
937+
case 'debug[3]': // angle achieved
938+
return {
939+
offset: 0,
940+
power: 1.0,
941+
inputRange: 1000,
942+
outputRange: 1.0,
943+
};
944+
case 'debug[1]': // angle error correction
945+
case 'debug[2]': // angle feedforward
946+
return {
947+
offset: 0,
948+
power: 1.0,
949+
inputRange: 5000,
950+
outputRange: 1.0,
951+
};
952+
default:
953+
return getCurveForMinMaxFields(fieldName);
954+
}
955+
case 'ANGLE_TEST1':
956+
switch (fieldName) {
957+
case 'debug[0]': // ?
958+
case 'debug[1]': // ?
959+
case 'debug[2]': // ?
960+
case 'debug[3]': // ?
961+
return {
962+
offset: 0,
963+
power: 1.0,
964+
inputRange: 5000,
965+
outputRange: 1.0,
966+
};
967+
default:
968+
return getCurveForMinMaxFields(fieldName);
969+
}
970+
case 'ANGLE_TEST2':
971+
switch (fieldName) {
972+
case 'debug[0]': // ?
973+
case 'debug[1]': // ?
974+
case 'debug[2]': // ?
975+
case 'debug[3]': // ?
976+
return {
977+
offset: 0,
978+
power: 1.0,
979+
inputRange: 5000,
980+
outputRange: 1.0,
981+
};
982+
default:
983+
return getCurveForMinMaxFields(fieldName);
984+
}
934985
}
935986
}
936987
// if not found above then

0 commit comments

Comments
 (0)