Skip to content

Commit bb7b021

Browse files
authored
Bug fix for flight modes names at the chart (#764)
* The checked flight mode index is limited by 31 value to prevent show of wrong 'mirror' modes at the charts * removed tittle 'Flight mode change' to get shorter flight modes description * missed semicolon issue is resolved
1 parent 0ce8ef7 commit bb7b021

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

src/flightlog_fields_presenter.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,15 +1337,19 @@ FlightLogFieldPresenter.presentFlags = function (flags, flagNames) {
13371337
FlightLogFieldPresenter.presentChangeEvent = function presentChangeEvent(
13381338
flags,
13391339
lastFlags,
1340-
flagNames
1341-
) {
1340+
flagNames)
1341+
{
13421342
let eventState = "";
13431343
let found = false;
1344-
1345-
for (let i = 0; i < flagNames.length; i++) {
1344+
const maxModeNumber = 32; // int has 32 bit only! We have not to roll bit shift 1<<i for i values grate then 31 !!!
1345+
let modesCount = flagNames.length;
1346+
if (modesCount > maxModeNumber) {
1347+
modesCount = maxModeNumber;
1348+
}
1349+
for (let i = 0; i < modesCount; i++) {
13461350
if ((1 << i) & (flags ^ lastFlags)) {
13471351
// State Changed
1348-
eventState += `|${flagNames[i]} ${(1 << i) & flags ? "ON" : "OFF"}`;
1352+
eventState += `${found ? "|" : ""}${flagNames[i]} ${(1 << i) & flags ? "ON" : "OFF"}`;
13491353
found = true;
13501354
}
13511355
}

src/grapher.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,11 +629,11 @@ export function FlightLogGrapher(
629629
drawEventLine(
630630
x,
631631
labelY,
632-
`Flight Mode Change${FlightLogFieldPresenter.presentChangeEvent(
632+
FlightLogFieldPresenter.presentChangeEvent(
633633
event.data.newFlags,
634634
event.data.lastFlags,
635635
FLIGHT_LOG_FLIGHT_MODE_NAME
636-
)}`,
636+
),
637637
"rgba(0,0,255,0.75)",
638638
3
639639
);

0 commit comments

Comments
 (0)