Skip to content

Commit

Permalink
Various fixes for debug modes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DzikuVx
DzikuVx committed Dec 22, 2017
1 parent afc8fb8 commit 4e0cd01
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 257 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>INAV - Blackbox Explorer</title>
<link rel="icon" type="image/png" href="images/icon-128.png">
<link rel="icon" type="image/png" href="images/bf_icon_128.png">
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">

Expand Down
35 changes: 10 additions & 25 deletions js/flightlog_fielddefs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,34 +149,19 @@ var
FILTER_TYPE = makeReadOnly([
"PT1",
"BIQUAD",
"FIR",
"FIR"
]),

DEBUG_MODE = makeReadOnly([
"NONE",
"CYCLETIME",
"BATTERY",
"GYRO",
"ACCELEROMETER",
"MIXER",
"AIRMODE",
"PIDLOOP",
"NOTCH",
"RC_INTERPOLATION",
"VELOCITY",
"DTERM_FILTER",
"ANGLERATE",
"ESC_SENSOR",
"SCHEDULER",
"STACK",
"DEBUG_ESC_SENSOR_RPM",
"DEBUG_ESC_SENSOR_TMP",
"DEBUG_ALTITUDE",
"DEBUG_FFT",
"DEBUG_FFT_TIME",
"DEBUG_FFT_FREQ",
"DEBUG_FRSKY_D_RX",
"DEBUG_GYRO_RAW"
"NONE",
"GYRO",
"NOTCH",
"NAV_LANDING_DETECTOR",
"FW_CLIMB_RATE_TO_ALTITUDE",
"RANGEFINDER",
"RANGEFINDER_QUALITY",
"PITOT",
"AGL"
]),

SUPER_EXPO_YAW = makeReadOnly([
Expand Down
236 changes: 19 additions & 217 deletions js/flightlog_fields_presenter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,176 +82,27 @@ function FlightLogFieldPresenter() {
};

var DEBUG_FRIENDLY_FIELD_NAMES = {
'NONE' : {
0 : { //Debug none
'debug[all]':'debug[all]',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',
'debug[3]':'debug[3]'
},
'CYCLETIME' : {
'debug[all]':'Debug Cycle Time',
'debug[0]':'Cycle Time',
'debug[1]':'CPU Load',
'debug[2]':'Motor Update',
'debug[3]':'Motor Deviation',
},
'BATTERY' : {
'debug[all]':'Debug Battery',
'debug[0]':'vbat_ADC',
'debug[1]':'vbat',
'debug[2]':'Not Used',
'debug[3]':'Not Used',
},
'GYRO' : {
1 : { //Debug gyro
'debug[all]':'Debug Gyro',
'debug[0]':'gyro_raw[X]',
'debug[1]':'gyro_raw[Y]',
'debug[2]':'gyro_raw[Z]',
'debug[3]':'Not Used',
},
'ACCELEROMETER' : {
'debug[all]':'Debug Acc',
'debug[0]':'acc_raw[X]',
'debug[1]':'acc_raw[Y]',
'debug[2]':'acc_raw[Z]',
'debug[3]':'Not Used',
},
'MIXER' : {
'debug[all]':'Debug Mixer',
'debug[0]':'rollPitchYawMix[0]',
'debug[1]':'rollPitchYawMix[1]',
'debug[2]':'rollPitchYawMix[2]',
'debug[3]':'rollPitchYawMix[3]',
},
'AIRMODE' : {
'debug[all]':'debug[all]',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',
},
'PIDLOOP' : {
'debug[all]':'Debug PID',
'debug[0]':'Wait Time',
'debug[1]':'Sub Update Time',
'debug[2]':'PID Update Time',
'debug[3]':'Motor Update Time',
'debug[3]':'Not Used'
},
'NOTCH' : {
2 : { //Debug Notch
'debug[all]':'Debug Notch',
'debug[0]':'gyro_preNotch[roll]',
'debug[1]':'gyro_preNotch[pitch]',
'debug[2]':'gyro_preNotch[yaw]',
'debug[3]':'Not Used',
},
'RC_INTERPOLATION' : {
'debug[all]':'Debug RC',
'debug[0]':'rcCommand_raw[roll]',
'debug[1]':'rcCommand_raw[pitch]',
'debug[2]':'rcCommand_raw[yaw]',
'debug[3]':'rxRefreshRate',
},
'VELOCITY' : {
'debug[all]':'debug[all]',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',
},
'DTERM_FILTER' : {
'debug[all]':'Debug Filter',
'debug[0]':'dterm_filter[roll]',
'debug[1]':'dterm_filter[pitch]',
'debug[2]':'Not Used',
'debug[3]':'Not Used',
},
'ANGLERATE' : {
'debug[all]':'Debug Anglerate',
'debug[0]':'Anglerate[roll]',
'debug[1]':'Anglerate[pitch]',
'debug[2]':'Anglerate[yaw]',
'debug[3]':'Not Used',
},
'ESC_SENSOR' : {
'debug[all]':'ESC Sensor',
'debug[0]':'Motor Index',
'debug[1]':'Timeouts',
'debug[2]':'Temperature',
'debug[3]':'RPM',
},
'SCHEDULER' : {
'debug[all]':'Scheduler',
'debug[0]':'Not Used',
'debug[1]':'Not Used',
'debug[2]':'Schedule Time',
'debug[3]':'Function Exec Time',
},
'STACK' : {
'debug[all]':'Stack',
'debug[0]':'Stack High Mem',
'debug[1]':'Stack Low Mem',
'debug[2]':'Stack Current',
'debug[3]':'Stack p',
},
'DEBUG_ESC_SENSOR_RPM' : {
'debug[all]':'Debug ESC Sensor RPM',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',

},
'DEBUG_ESC_SENSOR_TMP' : {
'debug[all]':'Debug ESC Sensor TMP',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',
},
'DEBUG_ALTITUDE' : {
'debug[all]':'Debug Altitude',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',
},
'DEBUG_FFT' : {
'debug[all]':'Debug FFT',
'debug[0]':'gyro_raw[roll]',
'debug[1]':'gyro_dyn_notch[roll]',
'debug[2]':'gyro_bpf[roll]',
'debug[3]':'fft_center_index[roll]',
},
'DEBUG_FFT_TIME' : {
'debug[all]':'Debug FFT TIME',
'debug[0]':'Active calc step',
'debug[1]':'Step duration',
'debug[2]':'Additional steps',
'debug[3]':'Not used',
},
'DEBUG_FFT_FREQ' : {
'debug[all]':'Debug FFT FREQ',
'debug[0]':'center_freq[roll]',
'debug[1]':'center_freq[pitch]',
'debug[2]':'center_freq[yaw]',
'debug[3]':'Not used',
},
'DEBUG_FRSKY_D_RX' : {
'debug[all]':'Debug FRSKY_D_RX',
'debug[0]':'debug[0]',
'debug[1]':'debug[1]',
'debug[2]':'debug[2]',
'debug[3]':'debug[3]',

},
'DEBUG_GYRO_RAW' : {
'debug[all]':'Debug Gyro Raw',
'debug[0]':'gyro_raw[X]',
'debug[1]':'gyro_raw[Y]',
'debug[2]':'gyro_raw[Z]',
'debug[3]':'Not Used',
},
'debug[3]':'Not Used'
}
};

function presentFlags(flags, flagNames) {
Expand Down Expand Up @@ -290,13 +141,13 @@ function FlightLogFieldPresenter() {
var found = false;
for(var i=0; i<=31; i++) {
if((1<<i) & (flags ^ lastFlags)) { // State Changed
eventState += '|' + flagNames[i] + ' ' + (((1<<i) & flags)?'ON':'OFF')
eventState += '|' + flagNames[i] + ' ' + (((1<<i) & flags)?'ON':'OFF');
found = true;
}
}
if(!found) {eventState += ' | ACRO';} // Catch the state when all flags are off, which is ACRO of course
return eventState;
}
};

function presentEnum(value, enumNames) {
if (enumNames[value] === undefined)
Expand Down Expand Up @@ -429,63 +280,9 @@ function FlightLogFieldPresenter() {
if(flightLog) {
var debugModeName = DEBUG_MODE[flightLog.getSysConfig().debug_mode]; // convert to recognisable name
switch (debugModeName) {
case 'NONE':
case 'AIRMODE':
case 'VELOCITY':
return "";
case 'CYCLETIME':
switch (fieldName) {
case 'debug[1]':
return value.toFixed(0) + "%";
default:
return value.toFixed(0) + "\u03BCS";
}
case 'PIDLOOP':
return value.toFixed(0) + "\u03BCS";
case 'BATTERY':
switch (fieldName) {
case 'debug[0]':
return value.toFixed(0);
default:
return (value/10).toFixed(1) + "V"
}
case 'GYRO':
case 'NOTCH':
return Math.round(flightLog.gyroRawToDegreesPerSecond(value)) + "deg/s";
case 'ACCELEROMETER':
return flightLog.accRawToGs(value).toFixed(2) + "g";
case 'MIXER':
return Math.round(flightLog.rcCommandRawToThrottle(value)) + " %";
case 'RC_INTERPOLATION':
switch (fieldName) {
case 'debug[3]':
return (value / 1000).toFixed(0) + 'mS';
default:
return value.toFixed(0);
}
case 'DFILTER':
return "";
case 'ANGLERATE':
return value.toFixed(0) + "deg/s";
case 'ESC_SENSOR':
switch (fieldName) {
case 'debug[2]':
return value.toFixed(0) + "°C";
case 'debug[3]':
return value.toFixed(0) + "rpm";
default:
return value.toFixed(0) + "\u03BCS";
}
case 'SCHEDULER':
return value.toFixed(0) + "\u03BCS";
case 'STACK':
return value.toFixed(0);
case 'DEBUG_FFT':
return Math.round(flightLog.gyroRawToDegreesPerSecond(value)) + "deg/s";
case 'DEBUG_FFT_TIME':
return value.toFixed(0) + "\u03BCS";
case 'DEBUG_FFT_FREQ':
return value.toFixed(0) + "Hz";
default:
return "";
}
Expand All @@ -494,12 +291,17 @@ function FlightLogFieldPresenter() {
};

FlightLogFieldPresenter.fieldNameToFriendly = function(fieldName, debugMode) {
if(debugMode) {
if(fieldName.includes('debug')) {
var debugFields = DEBUG_FRIENDLY_FIELD_NAMES[debugMode < DEBUG_MODE.length ? DEBUG_MODE[debugMode] : DEBUG_MODE[0]];
return debugFields[fieldName];
}

if (debugMode && fieldName.includes('debug')) {
var debugFields = DEBUG_FRIENDLY_FIELD_NAMES[debugMode];

if (debugFields !== undefined) {
return debugFields[fieldName];
} else {
return DEBUG_FRIENDLY_FIELD_NAMES[0][fieldName];
}
}

if (FRIENDLY_FIELD_NAMES[fieldName]) {
return FRIENDLY_FIELD_NAMES[fieldName];
}
Expand Down
31 changes: 18 additions & 13 deletions manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
{
"name": "INAV - Blackbox Explorer",
"description": "Interactive flight log viewer for INAV",
"version": "3.0.0",
"manifest_version": 2,
"app": {
"background": {
"scripts": ["background.js"]
"name": "INAV - Blackbox Explorer",
"description": "Interactive flight log viewer for INAV",
"version": "3.0.0",
"manifest_version": 2,
"default_locale": "en",
"app": {
"background": {
"scripts": ["background.js"]
}
},
"permissions": [
{
"fileSystem": ["write"]
},
"storage"
],
"icons": {
"128": "images/bf_icon_128.png"
}
},
"permissions": [
{"fileSystem": ["write"]},
"storage"
],
"icons": { "128": "images/icon-128.png" }
}
1 change: 0 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"default_locale": "en",
"scripts": {
"start": "node node_modules/nw/bin/nw .",
"debug": "node node_modules/gulp/bin/gulp.js debug",
"_postinstall": "node ./node_modules/platform-dependent-modules/cli.js",
"postinstall": "npm run _postinstall",
"gulp": "gulp"
Expand Down

0 comments on commit 4e0cd01

Please sign in to comment.