Added Bookmark feature

Similar to the Marker feature, bookmarks can store the current time for
fast recall. Store and recall bookmarks using keys 1 through 9 whilst
holding down the ALT key).

Author: Gary Keeble

index.html

@@ -509,13 +509,17 @@ <h5 class="modal-title-date"></h5>
 												<th colspan="5">D-Term</th>
 											</tr>
 											<tr>
+												<th class="bf-only">Calculation</th>
+												<th class="bf-only">Dynamic Threshold</th>
 												<th class="bf-only">Differentiator</th>
 												<th>Filter (Hz)</th>
 												<th class="bf-only">Average Count</th>
 											</tr>
 										</thead>
 										<tbody>
 											<tr>
+												<td class="bf-only"><select name='deltaMethod' title="deltaMethod"><!-- list generated here --></select></td>
+												<td class="bf-only"><input type="number" name="dynamic_dterm_threshold" title="dynamic_dterm_threshold" step="0.01" min="0" max="999.00" /></td>
 												<td class="bf-only"><select name='dterm_differentiator' title="dterm_differentiator"><!-- list generated here --></select></td>
 												<td><input type="number" name="dterm_lpf_hz" title="dterm_lpf_hz" step="0.01" min="0" max="999.00" /></td>
 												<td class="bf-only"><input type="number" name="dterm_average_count" title="dterm_average_count" step="1" min="0" max="12" /></td>
@@ -891,6 +895,14 @@ <h4 class="modal-title">Shortcut Keys</h4>
 									<li><span class=keys"><div class="key">Ctrl</div><div class="key">Z</div></span>
 												<div class="description">Swap back to your last graph configuration. Repeatedly pressing Ctrl-Z will toggle the last two graph configurations.</div></li>
 								</ul>
+								<ul>
+									<li><span class=keys"><div class="key">Alt</div><div class="key">Shift</div><div class="key">1</div><div class="normal">to</div><div class="key">9</div></span>
+												<div class="description">Save the current time to Bookmark hotkeys 1 through 9</div></li>
+									<li><span class=keys"><div class="key">Alt</div><div class="key">1</div><div class="normal">to</div><div class="key">9</div></span>
+												<div class="description">Recall Bookmark 1 though 9 to jump to specific time quickly.</div></li>
+									<li><span class=keys"><div class="key">Alt</div><div class="key">0</div></span>
+												<div class="description">Special Case, clear all bookmarks</div></li>
+								</ul>
 							</div>
 						</div>
                 	<div class="clear-both"></div>

js/flightlog_parser.js

@@ -473,6 +473,12 @@ var FlightLogParser = function(logData) {
             case "dterm_differentiator": // Betaflight Only
                 that.sysConfig.dterm_differentiator = parseInt(fieldValue, 10);
             break;
+            case "deltaMethod": // Betaflight Only
+                that.sysConfig.deltaMethod = parseInt(fieldValue, 10);
+            break;
+            case "dynamic_dterm_threshold": // Betaflight Only
+                that.sysConfig.dynamic_dterm_threshold = parseInt(fieldValue, 10);
+            break;
             case "H_sensitivity": // Betaflight Only
                 that.sysConfig.H_sensitivity = parseInt(fieldValue, 10);
             break;

js/grapher.js

@@ -655,6 +655,22 @@ function FlightLogGrapher(flightLog, graphConfig, canvas, craftCanvas, options)
                 label:'Marker:' +formatTime((markerEvent.time-flightLog.getMinTime())/1000, true) 
                 }, sequenceNum++);
         }
+
+        // Draw Bookmarks Event Line
+        var bookmarkEvents = blackboxLogViewer.getBookmarks();
+        if(bookmarkEvents!=null) {
+        	for(var i=0; i<=9; i++) {
+        		if(bookmarkEvents[i]!=null) {
+		            if(bookmarkEvents[i].state) drawEvent(
+		                {
+		                event:FlightLogEvent.CUSTOM,
+		                time:bookmarkEvents[i].time,
+		                label: i 
+		                }, sequenceNum++);
+		        	}
+        	}
+        }
+    
     }
 
     /**

js/header_dialog.js

@@ -325,6 +325,8 @@ function HeaderDialog(dialog, onSave) {
         setParameter('dterm_lpf_hz'				,sysConfig.dterm_lpf_hz,2);
         setParameter('dterm_cut_hz'				,sysConfig.dterm_cut_hz,2);
     	renderSelect('dterm_differentiator'		,sysConfig.dterm_differentiator, DTERM_DIFFERENTIATOR);
+    	renderSelect('deltaMethod'				,sysConfig.deltaMethod, PID_DELTA_TYPE);
+        setParameter('dynamic_dterm_threshold'	,sysConfig.dynamic_dterm_threshold,2);
         setParameter('H_sensitivity'			,sysConfig.H_sensitivity,2);
         setParameter('deadband'					,sysConfig.deadband,0);
         setParameter('yaw_deadband'				,sysConfig.yaw_deadband,0);

js/main.js

@@ -42,6 +42,7 @@ function BlackboxLogViewer() {
         // JSON array of graph configurations for New Workspaces feature
         lastGraphConfig = null,     // Undo feature - go back to last configuration.
         workspaceGraphConfigs = {}, // Workspaces
+        bookmarkTimes	= [],		// Empty array for bookmarks (times)
 
         // Graph configuration which is currently in use, customised based on the current flight log from graphConfig
         activeGraphConfig = new GraphConfig(),
@@ -582,6 +583,25 @@ function BlackboxLogViewer() {
             time:markerTime
             };
     }
+    
+    this.getBookmarks = function() { // get bookmark events
+    	var bookmarks = [];
+    	try {
+    		if(bookmarkTimes!=null) {
+		    	for(var i=0; i<=9; i++) {
+		    		if(bookmarkTimes[i]!=null) {
+			    		bookmarks[i] = {
+			    			state: (bookmarkTimes[i]!=0),
+			    			time:  bookmarkTimes[i]
+			    			};
+			    		} else bookmarks[i] = null;
+		    	}
+    		}
+	    	return bookmarks;	    		
+    	} catch(e) {
+    		return null;
+    	}
+    }
 
     prefs.get('videoConfig', function(item) {
         if (item) {
@@ -974,15 +994,38 @@ function BlackboxLogViewer() {
                     case "8".charCodeAt(0):
                     case "9".charCodeAt(0):
                         try {
-                        if (!e.shiftKey) { // retreive graph configuration from workspace
-                            if (workspaceGraphConfigs.graphConfig[e.which-48] != null) {
-                                newGraphConfig(workspaceGraphConfigs.graphConfig[e.which-48]);
-                            }
-                        } else // store configuration to workspace
-                        {
-                            workspaceGraphConfigs.graphConfig[e.which-48] = graphConfig; // Save current config
-                            prefs.set('workspaceGraphConfigs', workspaceGraphConfigs);      // Store to local cache
-                        }
+                        	if(!e.altKey) { // Workspaces feature
+                        		if (!e.shiftKey) { // retreive graph configuration from workspace
+		                            if (workspaceGraphConfigs.graphConfig[e.which-48] != null) {
+		                                newGraphConfig(workspaceGraphConfigs.graphConfig[e.which-48]);
+		                            }
+		                        } else // store configuration to workspace
+		                        {
+		                            workspaceGraphConfigs.graphConfig[e.which-48] = graphConfig; // Save current config
+		                            prefs.set('workspaceGraphConfigs', workspaceGraphConfigs);      // Store to local cache
+		                        }
+                        	} else { // Bookmark Feature
+                        		if (!e.shiftKey) { // retrieve time from bookmark
+		                            if (bookmarkTimes[e.which-48] != null) {
+		                                setCurrentBlackboxTime(bookmarkTimes[e.which-48]);
+		                                invalidateGraph(); 
+		                            }
+
+		                        } else {// store time to bookmark
+		                            // Special Case : Shift Alt 0 clears all bookmarks
+		                            if(e.which==48) {
+		                                bookmarkTimes = null;
+		                            } else {
+		                                if(bookmarkTimes==null) bookmarkTimes = new Array();
+                                        if (bookmarkTimes[e.which-48] == null) {
+                                             bookmarkTimes[e.which-48] = currentBlackboxTime; 		// Save current time to bookmark
+                                        } else {
+                                             bookmarkTimes[e.which-48] = null; 			            // clear the bookmark
+                                        }
+		                            }
+		                            invalidateGraph();
+		                        }
+                        	}
                         } catch(e) {
                             console.log('Workspace feature not functioning');
                         }