Skip to content

Commit 743b56b

Browse files
Gary KeebleGary Keeble
Gary Keeble
authored and
Gary Keeble
committed
Merge branch 'master' into phosphor-trails
2 parents 3608843 + 1a6fde7 commit 743b56b

File tree

5 files changed

+69
-41
lines changed

5 files changed

+69
-41
lines changed

‎index.html

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<div id="navbar" class="navbar-collapse collapse">
3737
<div class="navbar-form navbar-right" role="form">
3838
<div class="btn-group">
39-
<a class="btn btn-default btn-video-export"> Export video...</a>
40-
<a class="btn btn-primary btn-workspaces-export"> Export Workspaces...</a>
41-
<span class="btn btn-primary btn-file"> Open log file/video <input type="file" class="file-open" multiple></span>
39+
<a class="btn btn-default btn-video-export" data-toggle="tooltip" data-placement="auto top" title="Export your vide and chart setup to file"> Export video...</a>
40+
<a class="btn btn-primary btn-workspaces-export" data-toggle="tooltip" data-placement="auto top" title="Export your workspace confifurations to file"> Export Workspaces...</a>
41+
<span class="btn btn-primary btn-file" data-toggle="tooltip" data-placement="auto top" title="Open another log file, video file, exported workspace file or configuration dump file"> Open log file/video <input type="file" class="file-open" multiple></span>
4242
</div>
4343
</div>
4444
</div>
@@ -50,7 +50,7 @@
5050
<div class="jumbotron">
5151
<h1>Welcome to the Enhanced Blackbox Explorer!</h1>
5252
<p>This tool allows you to view and analyze logs created by Cleanflight's and Betaflight's Blackbox feature.</p>
53-
<span class="btn btn-primary btn-lg btn-file"> Open log file/video <input type="file" class="file-open" multiple></span>
53+
<span class="btn btn-primary btn-lg btn-file" data-toggle="tooltip" data-placement="auto top" title="Start by opening a log or video file"> Open log file/video <input type="file" class="file-open" multiple></span>
5454
</div>
5555
</div>
5656

@@ -166,31 +166,31 @@ <h1>Welcome to the Enhanced Blackbox Explorer!</h1>
166166
<h4>View</h4>
167167
<div>
168168
<div class="btn-group" role="group">
169-
<button type="button" class="btn btn-default open-user-settings-dialog" title="Show User Settings">
169+
<button type="button" class="btn btn-default open-user-settings-dialog" data-toggle="tooltip" data-placement="auto top" title="Show User Settings">
170170
<span class="glyphicon glyphicon-cog"></span>
171171
</button>
172-
<button type="button" class="btn btn-default open-header-dialog" title="View/hide header">
172+
<button type="button" class="btn btn-default open-header-dialog" data-toggle="tooltip" data-placement="auto top" title="View/hide header">
173173
<span class="glyphicon glyphicon-info-sign"></span>
174174
</button>
175-
<button type="button" class="btn btn-default view-video" title="View/hide video display">
175+
<button type="button" class="btn btn-default view-video" data-toggle="tooltip" data-placement="auto top" title="View/hide video display">
176176
<span class="glyphicon glyphicon-film"></span>
177177
</button>
178-
<button type="button" class="btn btn-default view-craft" title="View/hide craft display">
178+
<button type="button" class="btn btn-default view-craft" data-toggle="tooltip" data-placement="auto top" title="View/hide craft display">
179179
<span class="glyphicon glyphicon-plane"></span>
180180
</button>
181-
<button type="button" class="btn btn-default view-sticks" title="View/hide stick display">
181+
<button type="button" class="btn btn-default view-sticks" data-toggle="tooltip" data-placement="auto top" title="View/hide stick display">
182182
<span class="glyphicon glyphicon-pawn"></span>
183183
</button>
184-
<button type="button" class="btn btn-default view-table" title="View/hide statistics display">
184+
<button type="button" class="btn btn-default view-table" data-toggle="tooltip" data-placement="auto top" title="View/hide statistics display">
185185
<span class="glyphicon glyphicon-list-alt"></span>
186186
</button>
187-
<button type="button" class="btn btn-default view-analyser-sticks" style="display:none" title="View/hide stick analyser">
187+
<button type="button" class="btn btn-default view-analyser-sticks" style="display:none" data-toggle="tooltip" data-placement="auto top" title="View/hide stick analyser">
188188
<span class="glyphicon glyphicon-screenshot"></span>
189189
</button>
190-
<button type="button" class="btn btn-default view-analyser" title="View/hide analyser display">
190+
<button type="button" class="btn btn-default view-analyser" data-toggle="tooltip" data-placement="auto top" title="View/hide analyser display">
191191
<span class="glyphicon glyphicon-equalizer"></span>
192192
</button>
193-
<button type="button" class="btn btn-default view-analyser-fullscreen" title="Zoom Analyser Window">
193+
<button type="button" class="btn btn-default view-analyser-fullscreen" data-toggle="tooltip" data-placement="auto top" title="Zoom Analyser Window">
194194
<span class="glyphicon glyphicon-resize-full"></span><span class="glyphicon glyphicon-resize-small"></span>
195195
</button>
196196
</div>
@@ -200,25 +200,25 @@ <h4>View</h4>
200200
<h4>Playback</h4>
201201
<div>
202202
<div class="btn-group" role="group">
203-
<button type="button" class="btn btn-default video-jump-start" title="Jump to start of video">
203+
<button type="button" class="btn btn-default video-jump-start" data-toggle="tooltip" data-placement="auto top" title="Jump to start of video">
204204
<span class="glyphicon glyphicon-fast-backward"></span> <span class="glyphicon-text-alike">VID</span>
205205
</button>
206-
<button type="button" class="btn btn-default log-jump-start" title="Jump to start of log">
206+
<button type="button" class="btn btn-default log-jump-start" data-toggle="tooltip" data-placement="auto top" title="Jump to start of log">
207207
<span class="glyphicon glyphicon-fast-backward"></span>
208208
</button>
209-
<button type="button" class="btn btn-default log-jump-back">
209+
<button type="button" class="btn btn-default log-jump-back" data-toggle="tooltip" data-placement="auto top" title="Jump back">
210210
<span class="glyphicon glyphicon-step-backward"></span>
211211
</button>
212-
<button type="button" class="btn btn-default log-play-pause">
212+
<button type="button" class="btn btn-default log-play-pause" data-toggle="tooltip" data-placement="auto top" title="Play/Pause log/video">
213213
<span class="glyphicon glyphicon-play"></span>
214214
</button>
215-
<button type="button" class="btn btn-default log-jump-forward">
215+
<button type="button" class="btn btn-default log-jump-forward" data-toggle="tooltip" data-placement="auto top" title="Jump forward">
216216
<span class="glyphicon glyphicon-step-forward"></span>
217217
</button>
218-
<button type="button" class="btn btn-default log-jump-end" title="Jump to end of log">
218+
<button type="button" class="btn btn-default log-jump-end" data-toggle="tooltip" data-placement="auto top" title="Jump to end of log">
219219
<span class="glyphicon glyphicon-fast-forward"></span>
220220
</button>
221-
<button type="button" class="btn btn-default video-jump-end" title="Jump to end of video">
221+
<button type="button" class="btn btn-default video-jump-end" data-toggle="tooltip" data-placement="auto top" title="Jump to end of video">
222222
<span class="glyphicon-text-alike">VID</span> <span class="glyphicon glyphicon-fast-forward"></span>
223223
</button>
224224
</div>
@@ -229,7 +229,7 @@ <h4>Playback speed</h4>
229229
<div class="form-inline">
230230
<div class="form-group">
231231
<div class="playback-rate-control btn-group btn-group-vertical"></div>
232-
<input type="text" class="form-control playback-rate" value="1.0" size="5">
232+
<input type="text" class="form-control playback-rate" value="1.0" size="5" data-toggle="tooltip" data-placement="auto top" title="Directly set the playback speed">
233233
</div>
234234
</div>
235235
</li>
@@ -238,15 +238,15 @@ <h4>Zoom</h4>
238238
<div class="form-inline">
239239
<div class="form-group">
240240
<div class="graph-zoom-control btn-group btn-group-vertical"></div>
241-
<input type="text" class="form-control graph-zoom" value="-" size="6">
241+
<input type="text" class="form-control graph-zoom" value="-" size="6" data-toggle="tooltip" data-placement="auto top" title="Directly set the zoom level">
242242
</div>
243243
</div>
244244
</li>
245245
<li class="log-chart-time-panel">
246246
<h4>Time</h4>
247247
<div class="form-inline">
248248
<div class="form-group">
249-
<input type="text" class="form-control graph-time" value="1.0" size="8">
249+
<input type="text" class="form-control graph-time" value="1.0" size="8" data-toggle="tooltip" data-placement="auto top" title="Enter a time to jump to">
250250
</div>
251251
</div>
252252
</li>
@@ -255,15 +255,15 @@ <h4>Log sync</h4>
255255
<div class="form-inline">
256256
<div class="form-group">
257257
<div class="btn-group" role="group">
258-
<button type="button" class="btn btn-default log-sync-back" title="Move log earlier">
258+
<button type="button" class="btn btn-default log-sync-back" data-toggle="tooltip" data-placement="auto top" title="Move log earlier">
259259
<span class="glyphicon glyphicon-step-backward"></span>
260260
</button>
261261
<button type="button" class="btn btn-default log-sync-here">Start log here</button>
262-
<button type="button" class="btn btn-default log-sync-forward" title="Move log later">
262+
<button type="button" class="btn btn-default log-sync-forward" data-toggle="tooltip" data-placement="auto top" title="Move log later">
263263
<span class="glyphicon glyphicon-step-forward"></span>
264264
</button>
265265
</div>
266-
<input type="text" class="form-control video-offset" value="+0.0" size="7">
266+
<input type="text" class="form-control video-offset" value="+0.0" size="7" data-toggle="tooltip" data-placement="auto top" title="Enter a time offset">
267267
</div>
268268
</div>
269269
</li>
@@ -276,14 +276,14 @@ <h4>Log sync</h4>
276276
<canvas width="0" height="0" id="craftCanvas"></canvas>
277277
<canvas width="0" height="0" id="analyserCanvas"></canvas>
278278
<canvas width="0" height="0" id="analyserStickCanvas"></canvas>
279-
<span class="log-open-legend-dialog glyphicon glyphicon-cog"></span>
279+
<span class="log-open-legend-dialog glyphicon glyphicon-cog" data-toggle="tooltip" data-placement="auto top" title="Show the legend"></span>
280280
</div>
281281
<div class="log-graph-config">
282-
<h2>Legend <span class="log-close-legend-dialog glyphicon glyphicon-remove"></span><span class="open-keys-dialog glyphicon glyphicon-question-sign"></span></h2>
282+
<h2>Legend <span class="log-close-legend-dialog glyphicon glyphicon-remove" data-toggle="tooltip" data-placement="auto top" title="Hide the legend"></span><span class="open-keys-dialog glyphicon glyphicon-question-sign" data-toggle="tooltip" data-placement="auto top" title="Show the keyboard shortcuts"></span></h2>
283283
<div class="log-index"></div>
284284
<div class="log-graph-legend">
285285
</div>
286-
<button type="button" class="btn btn-default btn-block open-graph-configuration-dialog">Graph setup</button>
286+
<button type="button" class="btn btn-default btn-block open-graph-configuration-dialog" data-toggle="tooltip" data-placement="auto top" title="Setup chart pens">Graph setup</button>
287287
</div>
288288
</div>
289289
<div class="log-seek-bar">
@@ -367,7 +367,7 @@ <h2>Legend <span class="log-close-legend-dialog glyphicon glyphicon-remove"></sp
367367
<div class="modal-dialog">
368368
<div class="modal-content">
369369
<div class="modal-header">
370-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
370+
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-toggle="tooltip" data-placement="auto top" title="Close without saving changes">
371371
<span aria-hidden="true">&times;</span>
372372
</button>
373373
<h4 class="modal-title">Configure graphs</h4>
@@ -384,8 +384,8 @@ <h4 class="modal-title">Configure graphs</h4>
384384
</ul>
385385
</div>
386386
<div class="modal-footer">
387-
<button type="button" class="btn btn-default graph-configuration-dialog-cancel" data-dismiss="modal">Cancel</button>
388-
<button type="button" class="btn btn-primary graph-configuration-dialog-save" data-dismiss="modal">Save changes</button>
387+
<button type="button" class="btn btn-default graph-configuration-dialog-cancel" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close without saving changes">Cancel</button>
388+
<button type="button" class="btn btn-primary graph-configuration-dialog-save" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close and save changes">Save changes</button>
389389
</div>
390390
</div>
391391
</div>
@@ -394,7 +394,7 @@ <h4 class="modal-title">Configure graphs</h4>
394394
<div class="modal-dialog">
395395
<div class="modal-content">
396396
<div class="modal-header">
397-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
397+
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-toggle="tooltip" data-placement="auto top" title="Close without saving changes">
398398
<span aria-hidden="true">&times;</span>
399399
</button>
400400
<h4 class="modal-title">Log Header Information</h4>
@@ -841,9 +841,9 @@ <h5 class="modal-title-craft"></h5>
841841
<div class="clear-both"></div>
842842
</div>
843843
<div class="modal-footer">
844-
<button type="button" class="btn btn-default header-dialog-toggle">Cleanflight</button>
845-
<button type="button" class="btn btn-default header-dialog-cancel" data-dismiss="modal">Cancel</button>
846-
<button type="button" class="btn btn-primary header-dialog-save" data-dismiss="modal">Save changes</button>
844+
<button type="button" class="btn btn-default header-dialog-toggle" data-toggle="tooltip" data-placement="auto top" title="Change the header display for the respective firmware type">Cleanflight</button>
845+
<button type="button" class="btn btn-default header-dialog-cancel" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close without saving changes">Cancel</button>
846+
<button type="button" class="btn btn-primary header-dialog-save" style="display:none;" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close and save changes">Save changes</button>
847847
</div>
848848
</div>
849849
</div>
@@ -852,7 +852,7 @@ <h5 class="modal-title-craft"></h5>
852852
<div class="modal-dialog">
853853
<div class="modal-content">
854854
<div class="modal-header">
855-
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
855+
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-toggle="tooltip" data-placement="auto top" title="Close the dialog box">
856856
<span aria-hidden="true">&times;</span>
857857
</button>
858858
<h4 class="modal-title">Shortcut Keys</h4>
@@ -965,7 +965,7 @@ <h4 class="modal-title">Shortcut Keys</h4>
965965
<div class="clear-both"></div>
966966
</div>
967967
<div class="modal-footer">
968-
<button type="button" class="btn btn-default keys-dialog-cancel" data-dismiss="modal">Cancel</button>
968+
<button type="button" class="btn btn-default keys-dialog-cancel" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close the dialog box">Cancel</button>
969969
</div>
970970
</div>
971971
</div>
@@ -1075,9 +1075,9 @@ <h4 class="modal-title">Export video</h4>
10751075
</div>
10761076
</div>
10771077
<div class="modal-footer">
1078-
<button type="button" class="btn btn-default video-export-dialog-cancel" data-dismiss="modal">Cancel</button>
1079-
<button type="button" class="btn btn-default video-export-dialog-close" data-dismiss="modal">Close</button>
1080-
<button type="button" class="btn btn-primary video-export-dialog-start">Begin export</button>
1078+
<button type="button" class="btn btn-default video-export-dialog-cancel" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Cancel video generation">Cancel</button>
1079+
<button type="button" class="btn btn-default video-export-dialog-close" data-dismiss="modal" data-toggle="tooltip" data-placement="auto top" title="Close dialog box">Close</button>
1080+
<button type="button" class="btn btn-primary video-export-dialog-start" data-toggle="tooltip" data-placement="auto top" title="Start generating video file">Begin export</button>
10811081
</div>
10821082
</div>
10831083
</div>

‎js/flightlog_fielddefs.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ var
2222

2323
GTUNE_CYCLE_RESULT: 20,
2424
FLIGHT_MODE: 30, // New Event type
25+
TWITCH_TEST: 40, // Feature for latency testing
2526

2627
CUSTOM : 250, // Virtual Event Code - Never part of Log File.
2728
CUSTOM_BLANK : 251, // Virtual Event Code - Never part of Log File. - No line shown

0 commit comments

Comments
 (0)