Skip to content

Commit c333ca6

Browse files
committed
Merge branch '20221125-display-map-with-gps-data' of https://github.com/bonchan/blackbox-log-viewer into 20221125-display-map-with-gps-data
2 parents 4819ab1 + f590d20 commit c333ca6

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Please remember the issue tracker on github is _not_ for user support. Please a
44

55
Issues created without steps to repeat are likely to be closed. E-mail requests for support will go un-answered; All support needs to be public so that other people can read the problems and solutions.
66

7-
Remember that issues that are due to mis-configuration, wiring or failure to read documentation just takes time away from the developers and can often be solved without developer interaction by other users.
7+
Remember that issues that are due to misconfiguration, wiring or failure to read documentation just takes time away from the developers and can often be solved without developer interaction by other users.
88

99
Please search for existing issues *before* creating new ones.
1010

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Changes to the security model used in the latest versions of MacOS X 10.14 (Moja
2626

2727
### Unstable Testing Versions
2828

29-
Unstable testing versions of the lates builds of the Betaflight Blackbox Explorer for most platforms can be downloaded from [here](https://github.com/betaflight/blackbox-log-viewer-nightlies/releases).
29+
Unstable testing versions of the latest builds of the Betaflight Blackbox Explorer for most platforms can be downloaded from [here](https://github.com/betaflight/blackbox-log-viewer-nightlies/releases).
3030

3131
**Be aware that these versions are intended for testing / feedback only, and may be buggy or broken.**
3232

@@ -116,8 +116,8 @@ yarn start
116116

117117

118118
#### Build or release app for one specific platform
119-
To build or release only for one specific platform you can append the plaform after the `task-name`.
120-
If no platform is provided, only for the platform you are builing from will be build.
119+
To build or release only for one specific platform you can append the platform after the `task-name`.
120+
If no platform is provided, only for the platform you are building from will be build.
121121

122122
* **MacOS X** use `yarn gulp <task-name> --osx64`
123123
* **Linux** use `yarn gulp <task-name> --linux64`
@@ -128,7 +128,7 @@ If no platform is provided, only for the platform you are builing from will be b
128128
#### macOS DMG installation background image
129129

130130
The release distribution for macOS uses a DMG file to install the application.
131-
The PSD source for the DMG backgound image can be found in the root (`dmg-background.png`). After changing the source, export the image to PNG format in folder `./images/`.
131+
The PSD source for the DMG background image can be found in the root (`dmg-background.png`). After changing the source, export the image to PNG format in folder `./images/`.
132132

133133
## Flight video won't load, or jumpy flight video upon export
134134

changelog.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ <h2>2.5.0 - Grids, INAV Header Support and Stick Trails.</h2>
310310
<li>Gyro chart range increased to +/-2000deg/s was a minor calculation error that limited the gyro chart to approx +/-1500deg/s</li>
311311
<li>Header update for Betaflight v3.0; added fields gyro_notch_hz, gyro_notch_q, rc_smooth_interval and "Craft name"</li>
312312
<li>Craft Name is now shown on status bar (if entered in CLI) and also at top of header dialog (Betaflight v3.0 only).</li>
313-
<li>PID Contoller type names on header updated for Betaflight v3.0.</li>
313+
<li>PID Controller type names on header updated for Betaflight v3.0.</li>
314314
<li>Stick Trails; This feature can be turned on from the User Settings dialog, will show a phosphor trail on the stick display that shows the movement of the sticks for the last 500ms.</li>
315315
<li>Add tooltips to primary logger controls.</li>
316316
<li>Thanks to BorisB, Added New Event names for Betaflight Twitch Testing mode.</li>

css/header_dialog.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Colums START> */
1+
/* Columns START> */
22
.cf_column {
33
min-height: 18px;
44
margin-bottom: 0;

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ <h5 class="modal-title-revision"></h5>
952952
<input type="text" step="0.01" min="0" max="999" />
953953
</td>
954954
<td name="feedforwardAveraging" class="bf-only">
955-
<label>Avgerage</label>
955+
<label>Average</label>
956956
<select>
957957
<!~~ list generated here ~~>
958958
</select>

js/cache.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use strict";
22

33
/**
4-
* A FIFO cache to hold key-pair mappings. Its capacity will be at least the intialCapacity
4+
* A FIFO cache to hold key-pair mappings. Its capacity will be at least the initialCapacity
55
* supplied on creation, which you can increase by increasing the "capacity" property.
66
*
77
* One extra element beyond the set capacity will be stored which can be fetched by calling "recycle()".

js/datastream.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ var ArrayDataStream;
145145

146146
/**
147147
* Search for the string 'needle' beginning from the current stream position up
148-
* to the end position. Return the offset of the first occurance found.
148+
* to the end position. Return the offset of the first occurrence found.
149149
*
150150
* @param needle
151151
* String to search for

js/flightlog_parser.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ var FlightLogParser = function(logData) {
200200
// be an older name which is translated into a current name in the table below
201201

202202
defaultSysConfigExtension = {
203-
abs_control_gain:null, // Aboslute control gain
203+
abs_control_gain:null, // Absolute control gain
204204
anti_gravity_gain:null, // Anti gravity gain
205205
anti_gravity_mode:null, // Anti gravity mode
206206
anti_gravity_threshold:null, // Anti gravity threshold for step mode
@@ -273,7 +273,7 @@ var FlightLogParser = function(logData) {
273273
rc_smoothing_active_cutoffs:[null,null],// RC Smoothing active cutoffs
274274
rc_smoothing_cutoffs:[null, null], // RC Smoothing input and derivative cutoff
275275
rc_smoothing_filter_type:[null,null], // RC Smoothing input and derivative type
276-
rc_smoothing_rx_average:null, // RC Smoothing rx average readed in ms
276+
rc_smoothing_rx_average:null, // RC Smoothing rx average read in ms
277277
rc_smoothing_debug_axis:null, // Axis recorded in the debug mode of rc_smoothing
278278
dterm_filter_type:null, // D term filtering type (PT1, BIQUAD, PT2, PT3)
279279
dterm_filter2_type:null, // D term 2 filtering type (PT1, BIQUAD, PT2, PT3)

js/graph_config_dialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function GraphConfigurationDialog(dialog, onSave) {
134134
$('select.color-picker', elem).replaceWith(chooseColor(color));
135135

136136

137-
// Ade event when selection changed to retreive the current smoothing settings.
137+
// Add event when selection changed to retrieve the current smoothing settings.
138138
$('select.form-control', elem).change( function() {
139139
var selectedField = {
140140
name: $('select.form-control option:selected', elem).val()
@@ -314,7 +314,7 @@ function GraphConfigurationDialog(dialog, onSave) {
314314
name: $("select", this).val(),
315315
smoothing: parseInt($("input[name=smoothing]", this).val())*100, // Value 0-100% = 0-10000uS (higher values are more smooth, 30% is typical)
316316
curve: {
317-
power: parseInt($("input[name=power]", this).val())/100.0, // Value 0-100% = 0-1.0 (lower values exagerate center values - expo)
317+
power: parseInt($("input[name=power]", this).val())/100.0, // Value 0-100% = 0-1.0 (lower values exaggerate center values - expo)
318318
outputRange: parseInt($("input[name=scale]", this).val())/100.0 // Value 0-100% = 0-1.0 (higher values > 100% zoom in graph vertically)
319319
},
320320
default: { // These are used to restore configuration if using mousewheel adjustments

js/grapher.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ function FlightLogGrapher(flightLog, graphConfig, canvas, stickCanvas, craftCanv
729729
craft3D.resize(craftSize, craftSize);
730730
}
731731

732-
// Positon the craft canvas according to options
732+
// Position the craft canvas according to options
733733
$(craftCanvas).css({
734734
left:Math.max(((canvas.width * parseInt(options.craft.left) / 100.0) - (craftSize / 2)), 0) + "px",
735735
top: Math.max(((canvas.height * parseInt(options.craft.top) / 100.0) - (craftSize / 2)), 0) + "px",

0 commit comments

Comments
 (0)