Skip to content

Commit 363a643

Browse files
ctzsnoozectzsnooze
committed
Add GPS Rescue Tracking debug
1 parent 245e7f4 commit 363a643

File tree

3 files changed

+49
-55
lines changed

3 files changed

+49
-55
lines changed

‎js/flightlog_fielddefs.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ var
341341
"RX_EXPRESSLRS_PHASELOCK",
342342
"DEBUG_RX_STATE_TIME",
343343
"GPS_RESCUE_VELOCITY",
344-
"GPS_RESCUE_HEADING"
344+
"GPS_RESCUE_HEADING",
345+
"GPS_RESCUE_TRACKING"
345346
]),
346347

347348
SUPER_EXPO_YAW = makeReadOnly([

‎js/flightlog_fields_presenter.js‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -636,9 +636,16 @@ function FlightLogFieldPresenter() {
636636
'GPS_RESCUE_HEADING' : {
637637
'debug[all]':'GPS Rescue Heading',
638638
'debug[0]':'Error angle',
639-
'debug[1]':'Angle to home',
640-
'debug[2]':'Rescue Yaw rate',
641-
'debug[3]':'Rescue Roll angle',
639+
'debug[1]':'Rescue Yaw',
640+
'debug[2]':'Attitude',
641+
'debug[3]':'Angle to home',
642+
},
643+
'GPS_RESCUE_TRACKING' : {
644+
'debug[all]':'GPS Rescue Tracking',
645+
'debug[0]':'Velocity to home',
646+
'debug[1]':'Target velocity',
647+
'debug[2]':'Altitude',
648+
'debug[3]':'Target altitude',
642649
},
643650
};
644651

@@ -1084,7 +1091,7 @@ function FlightLogFieldPresenter() {
10841091
switch (fieldName) {
10851092
// debug 0 = Throttle P
10861093
// debug 1 = Throttle I
1087-
// debug 3 = Throttle D
1094+
// debug 2 = Throttle D
10881095
case 'debug[3]': // current altitude in m
10891096
return (value / 100).toFixed(2) + 'm';
10901097
default:
@@ -1170,20 +1177,27 @@ function FlightLogFieldPresenter() {
11701177
}
11711178
case 'GPS_RESCUE_HEADING':
11721179
switch (fieldName) {
1173-
// debug 0 = error angle tenths of a degree
11741180
case 'debug[0]': // error angle tenths of a degree
1175-
return (value / 10).toFixed(1) + 'deg';
1176-
// debug 1 = Velocity I
11771181
case 'debug[1]': // angle to home in tenths of a degree
11781182
return (value / 10).toFixed(1) + 'deg';
1179-
// debug 2 = Velocity D
11801183
case 'debug[2]': // commanded yaw rate in tenths of a degree
11811184
return (value / 10).toFixed(1) + 'deg/s';
11821185
case 'debug[3]': // roll angle in hundredths of a degree
11831186
return (value / 100).toFixed(2) + 'deg';
11841187
default:
11851188
return value.toFixed(0);
11861189
}
1190+
case 'GPS_RESCUE_TRACKING':
1191+
switch (fieldName) {
1192+
case 'debug[0]': // velocity to home cm/s
1193+
case 'debug[1]': // velocity target cm/s
1194+
return (value / 100).toFixed(2) + 'm/s';
1195+
case 'debug[2]': // altitude cm
1196+
case 'debug[3]': // altitude target cm
1197+
return (value / 100).toFixed(2) + 'm';
1198+
default:
1199+
return value.toFixed(0);
1200+
}
11871201
}
11881202
return value.toFixed(0);
11891203
}

‎js/graph_config.js‎

Lines changed: 25 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -739,31 +739,19 @@ GraphConfig.load = function(config) {
739739
case 'GPS_RESCUE_THROTTLE_PID':
740740
switch (fieldName) {
741741
case 'debug[0]': // Throttle P
742-
return {
743-
offset: 0,
744-
power: 1.0,
745-
inputRange: 500,
746-
outputRange: 1.0,
747-
};
748742
case 'debug[1]': // Throttle I
749-
return {
750-
offset: 0,
751-
power: 1.0,
752-
inputRange: 500,
753-
outputRange: 1.0,
754-
};
755743
case 'debug[2]': // Throttle D
756744
return {
757745
offset: 0,
758746
power: 1.0,
759-
inputRange: 500,
747+
inputRange: 300,
760748
outputRange: 1.0,
761749
};
762750
case 'debug[3]': // Altitude
763751
return {
764-
offset: -10000,
752+
offset: 0,
765753
power: 1.0,
766-
inputRange: 10000,
754+
inputRange: 5000,
767755
outputRange: 1.0,
768756
};
769757
default:
@@ -772,26 +760,8 @@ GraphConfig.load = function(config) {
772760
case 'GPS_RESCUE_VELOCITY':
773761
switch (fieldName) {
774762
case 'debug[0]': // Throttle P
775-
return {
776-
offset: 0,
777-
power: 1.0,
778-
inputRange: 500,
779-
outputRange: 1.0,
780-
};
781763
case 'debug[1]': // Throttle I
782-
return {
783-
offset: 0,
784-
power: 1.0,
785-
inputRange: 500,
786-
outputRange: 1.0,
787-
};
788764
case 'debug[2]': // Throttle D
789-
return {
790-
offset: 0,
791-
power: 1.0,
792-
inputRange: 500,
793-
outputRange: 1.0,
794-
};
795765
case 'debug[3]': // Velocity cm/s
796766
return {
797767
offset: 0,
@@ -805,19 +775,7 @@ GraphConfig.load = function(config) {
805775
case 'GPS_RESCUE_HEADING':
806776
switch (fieldName) {
807777
case 'debug[0]': // Error angle tenths of a degree
808-
return {
809-
offset: 0,
810-
power: 1.0,
811-
inputRange: 100,
812-
outputRange: 1.0,
813-
};
814778
case 'debug[1]': // Angle to home tenths of a degree
815-
return {
816-
offset: 0,
817-
power: 1.0,
818-
inputRange: 1800,
819-
outputRange: 1.0,
820-
};
821779
case 'debug[2]': // Rescue yaw rate deg/s * 10
822780
return {
823781
offset: 0,
@@ -835,7 +793,7 @@ GraphConfig.load = function(config) {
835793
default:
836794
return getCurveForMinMaxFields(fieldName);
837795
}
838-
case 'RTH':
796+
case 'RTH':
839797
switch (fieldName) {
840798
case 'debug[0]': // FailureState
841799
return {
@@ -868,6 +826,27 @@ GraphConfig.load = function(config) {
868826
default:
869827
return getCurveForMinMaxFields(fieldName);
870828
}
829+
case 'GPS_RESCUE_TRACKING':
830+
switch (fieldName) {
831+
case 'debug[0]': // velocity to home cm/s
832+
case 'debug[1]': // target velocity cm/s
833+
return {
834+
offset: 0,
835+
power: 1.0,
836+
inputRange: 500,
837+
outputRange: 1.0,
838+
};
839+
case 'debug[2]': // altitude m
840+
case 'debug[3]': // Target altitude m
841+
return {
842+
offset: 0,
843+
power: 1.0,
844+
inputRange: 5000,
845+
outputRange: 1.0,
846+
};
847+
default:
848+
return getCurveForMinMaxFields(fieldName);
849+
}
871850
}
872851
}
873852
// if not found above then

0 commit comments

Comments
 (0)