Skip to content

Commit 8054aa7

Browse files
blckmnblckmn
authored
Merge pull request #2464 from chmelevskij/modules/moooooooore-modules
2 parents b7d1ec0 + 852c88d commit 8054aa7

25 files changed

+348
-218
lines changed

‎src/js/main.js‎

Lines changed: 69 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -343,73 +343,119 @@ function startProcess() {
343343
);
344344
break;
345345
case 'help':
346-
import('./tabs/help').then(({ help }) => help.initialize(content_ready));
346+
import("./tabs/help").then(({ help }) =>
347+
help.initialize(content_ready),
348+
);
347349
break;
348350
case 'auxiliary':
349-
TABS.auxiliary.initialize(content_ready);
351+
import("./tabs/auxiliary").then(({ auxiliary }) =>
352+
auxiliary.initialize(content_ready),
353+
);
350354
break;
351355
case 'adjustments':
352-
TABS.adjustments.initialize(content_ready);
356+
import("./tabs/adjustments").then(({ adjustments }) =>
357+
adjustments.initialize(content_ready),
358+
);
353359
break;
354360
case 'ports':
355-
TABS.ports.initialize(content_ready);
361+
import("./tabs/ports").then(({ ports }) =>
362+
ports.initialize(content_ready),
363+
);
356364
break;
357365
case 'led_strip':
358-
TABS.led_strip.initialize(content_ready);
366+
import("./tabs/led_strip").then(({ led_strip }) =>
367+
led_strip.initialize(content_ready),
368+
);
359369
break;
360370
case 'failsafe':
361-
TABS.failsafe.initialize(content_ready);
371+
import("./tabs/failsafe").then(({ failsafe }) =>
372+
failsafe.initialize(content_ready),
373+
);
362374
break;
363375
case 'transponder':
364-
TABS.transponder.initialize(content_ready);
376+
import("./tabs/transponder").then(({ transponder }) =>
377+
transponder.initialize(content_ready),
378+
);
365379
break;
366380
case 'osd':
367-
TABS.osd.initialize(content_ready);
381+
import("./tabs/osd").then(({ osd }) =>
382+
osd.initialize(content_ready),
383+
);
368384
break;
369385
case 'vtx':
370-
TABS.vtx.initialize(content_ready);
386+
import("./tabs/vtx").then(({ vtx }) =>
387+
vtx.initialize(content_ready),
388+
);
371389
break;
372390
case 'power':
373-
TABS.power.initialize(content_ready);
391+
import("./tabs/power").then(({ power }) =>
392+
power.initialize(content_ready),
393+
);
374394
break;
375395
case 'setup':
376-
TABS.setup.initialize(content_ready);
396+
import("./tabs/setup").then(({ setup }) =>
397+
setup.initialize(content_ready),
398+
);
377399
break;
378400
case 'setup_osd':
379-
TABS.setup_osd.initialize(content_ready);
401+
import("./tabs/setup_osd").then(({ setup_osd }) =>
402+
setup_osd.initialize(content_ready),
403+
);
380404
break;
381405
case 'configuration':
382-
TABS.configuration.initialize(content_ready);
406+
import("./tabs/configuration").then(({ configuration }) =>
407+
configuration.initialize(content_ready),
408+
);
383409
break;
384410
case 'pid_tuning':
385-
TABS.pid_tuning.initialize(content_ready);
411+
import("./tabs/pid_tuning").then(({ pid_tuning }) =>
412+
pid_tuning.initialize(content_ready),
413+
);
386414
break;
387415
case 'receiver':
388-
TABS.receiver.initialize(content_ready);
416+
import("./tabs/receiver").then(({ receiver }) =>
417+
receiver.initialize(content_ready),
418+
);
389419
break;
390420
case 'servos':
391-
TABS.servos.initialize(content_ready);
421+
import("./tabs/servos").then(({ servos }) =>
422+
servos.initialize(content_ready),
423+
);
392424
break;
393425
case 'gps':
394-
TABS.gps.initialize(content_ready);
426+
import("./tabs/gps").then(({ gps }) =>
427+
gps.initialize(content_ready),
428+
);
395429
break;
396430
case 'motors':
397-
TABS.motors.initialize(content_ready);
431+
import("./tabs/motors").then(({ motors }) =>
432+
motors.initialize(content_ready),
433+
);
398434
break;
399435
case 'sensors':
400-
TABS.sensors.initialize(content_ready);
436+
import("./tabs/sensors").then(({ sensors }) =>
437+
sensors.initialize(content_ready),
438+
);
401439
break;
402440
case 'logging':
403-
TABS.logging.initialize(content_ready);
441+
import("./tabs/logging").then(({ logging }) =>
442+
logging.initialize(content_ready),
443+
);
404444
break;
405445
case 'onboard_logging':
406-
TABS.onboard_logging.initialize(content_ready);
446+
import("./tabs/onboard_logging").then(({ onboard_logging }) =>
447+
onboard_logging.initialize(content_ready),
448+
);
407449
break;
408450
case 'cli':
409-
TABS.cli.initialize(content_ready, GUI.nwGui);
451+
import("./tabs/cli").then(({ cli }) =>
452+
cli.initialize(content_ready),
453+
);
410454
break;
411455
case 'presets':
412-
TABS.presets.initialize(content_ready, GUI.nwGui);
456+
import("../tabs/presets/presets").then(({ presets }) =>
457+
presets.initialize(content_ready),
458+
);
413459
break;
414460

415461
default:

‎src/js/tabs/adjustments.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
import { i18n } from '../localization';
22

3-
TABS.adjustments = {};
3+
const adjustments = {};
44

5-
TABS.adjustments.initialize = function (callback) {
5+
adjustments.initialize = function (callback) {
66
const self = this;
77
GUI.active_tab_ref = this;
88
GUI.active_tab = 'adjustments';
@@ -282,11 +282,11 @@ TABS.adjustments.initialize = function (callback) {
282282
}
283283
};
284284

285-
TABS.adjustments.cleanup = function (callback) {
285+
adjustments.cleanup = function (callback) {
286286
if (callback) callback();
287287
};
288288

289-
TABS.adjustments.adjust_template = function () {
289+
adjustments.adjust_template = function () {
290290

291291
const selectFunction = $('#functionSelectionSelect');
292292
let elementsNumber;
@@ -322,3 +322,8 @@ TABS.adjustments.adjust_template = function () {
322322
element23.insertAfter(selectFunction.find("option[value='28']"));
323323
}
324324
};
325+
326+
window.TABS.adjustments = adjustments;
327+
export {
328+
adjustments,
329+
};

‎src/js/tabs/auxiliary.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
import { i18n } from '../localization';
22

3-
TABS.auxiliary = {};
3+
const auxiliary = {};
44

5-
TABS.auxiliary.initialize = function (callback) {
5+
auxiliary.initialize = function (callback) {
66
GUI.active_tab_ref = this;
77
GUI.active_tab = 'auxiliary';
88
let prevChannelsValues = null;
@@ -565,6 +565,11 @@ TABS.auxiliary.initialize = function (callback) {
565565
}
566566
};
567567

568-
TABS.auxiliary.cleanup = function (callback) {
568+
auxiliary.cleanup = function (callback) {
569569
if (callback) callback();
570570
};
571+
572+
window.TABS.auxiliary = auxiliary;
573+
export {
574+
auxiliary,
575+
};

‎src/js/tabs/cli.js‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
'use strict';
1+
import { i18n } from "../localization";
22

3-
TABS.cli = {
3+
const cli = {
44
lineDelayMs: 15,
55
profileSwitchDelayMs: 100,
66
outputHistory: "",
@@ -75,7 +75,7 @@ function copyToClipboard(text) {
7575
Clipboard.writeText(text, onCopySuccessful, onCopyFailed);
7676
}
7777

78-
TABS.cli.initialize = function (callback) {
78+
cli.initialize = function (callback) {
7979
const self = this;
8080

8181
if (GUI.active_tab !== 'cli') {
@@ -323,7 +323,7 @@ TABS.cli.initialize = function (callback) {
323323
});
324324
};
325325

326-
TABS.cli.adaptPhones = function() {
326+
cli.adaptPhones = function() {
327327
if ($(window).width() < 575) {
328328
const backdropHeight = $('.note').height() + 22 + 38;
329329
$('.backdrop').css('height', `calc(100% - ${backdropHeight}px)`);
@@ -334,24 +334,24 @@ TABS.cli.adaptPhones = function() {
334334
}
335335
};
336336

337-
TABS.cli.history = {
337+
cli.history = {
338338
history: [],
339339
index: 0,
340340
};
341341

342-
TABS.cli.history.add = function (str) {
342+
cli.history.add = function (str) {
343343
this.history.push(str);
344344
this.index = this.history.length;
345345
};
346346

347-
TABS.cli.history.prev = function () {
347+
cli.history.prev = function () {
348348
if (this.index > 0) {
349349
this.index -= 1;
350350
}
351351
return this.history[this.index];
352352
};
353353

354-
TABS.cli.history.next = function () {
354+
cli.history.next = function () {
355355
if (this.index < this.history.length) {
356356
this.index += 1;
357357
}
@@ -385,7 +385,7 @@ function setPrompt(text) {
385385
$('.tab-cli textarea').val(text);
386386
}
387387

388-
TABS.cli.read = function (readInfo) {
388+
cli.read = function (readInfo) {
389389
/* Some info about handling line feeds and carriage return
390390
391391
line feed = LF = \n = 0x0A = 10
@@ -487,15 +487,15 @@ TABS.cli.read = function (readInfo) {
487487
}
488488
};
489489

490-
TABS.cli.sendLine = function (line, callback) {
490+
cli.sendLine = function (line, callback) {
491491
this.send(`${line}\n`, callback);
492492
};
493493

494-
TABS.cli.sendNativeAutoComplete = function (line, callback) {
494+
cli.sendNativeAutoComplete = function (line, callback) {
495495
this.send(`${line}\t`, callback);
496496
};
497497

498-
TABS.cli.send = function (line, callback) {
498+
cli.send = function (line, callback) {
499499
const bufferOut = new ArrayBuffer(line.length);
500500
const bufView = new Uint8Array(bufferOut);
501501

@@ -506,7 +506,7 @@ TABS.cli.send = function (line, callback) {
506506
serial.send(bufferOut, callback);
507507
};
508508

509-
TABS.cli.cleanup = function (callback) {
509+
cli.cleanup = function (callback) {
510510
if (TABS.cli.GUI.snippetPreviewWindow) {
511511
TABS.cli.GUI.snippetPreviewWindow.destroy();
512512
TABS.cli.GUI.snippetPreviewWindow = null;
@@ -534,3 +534,8 @@ TABS.cli.cleanup = function (callback) {
534534
CliAutoComplete.cleanup();
535535
$(CliAutoComplete).off();
536536
};
537+
538+
window.TABS.cli = cli;
539+
export {
540+
cli,
541+
};

‎src/js/tabs/configuration.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
'use strict';
1+
import semver from 'semver';
2+
import { i18n } from '../localization';
23

3-
TABS.configuration = {
4+
const configuration = {
45
analyticsChanges: {},
56
};
67

7-
TABS.configuration.initialize = function (callback) {
8+
configuration.initialize = function (callback) {
89
const self = this;
910

1011
if (GUI.active_tab != 'configuration') {
@@ -641,6 +642,9 @@ TABS.configuration.initialize = function (callback) {
641642
}
642643
};
643644

644-
TABS.configuration.cleanup = function (callback) {
645+
configuration.cleanup = function (callback) {
645646
if (callback) callback();
646647
};
648+
649+
window.TABS.configuration = configuration;
650+
export { configuration };

‎src/js/tabs/failsafe.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
'use strict';
1+
import { i18n } from "../localization";
22

3-
TABS.failsafe = {};
3+
const failsafe = {};
44

5-
TABS.failsafe.initialize = function (callback, scrollPosition) {
5+
failsafe.initialize = function (callback, scrollPosition) {
66
const self = this;
77

88
if (GUI.active_tab != 'failsafe') {
@@ -432,6 +432,11 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
432432
}
433433
};
434434

435-
TABS.failsafe.cleanup = function (callback) {
435+
failsafe.cleanup = function (callback) {
436436
if (callback) callback();
437437
};
438+
439+
window.TABS.failsafe = failsafe;
440+
export {
441+
failsafe,
442+
};

‎src/js/tabs/gps.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
'use strict';
1+
import { i18n } from "../localization";
22

3-
TABS.gps = {};
4-
TABS.gps.initialize = function (callback) {
3+
const gps = {};
4+
gps.initialize = function (callback) {
55

66
if (GUI.active_tab !== 'gps') {
77
GUI.active_tab = 'gps';
@@ -219,6 +219,11 @@ TABS.gps.initialize = function (callback) {
219219

220220
};
221221

222-
TABS.gps.cleanup = function (callback) {
222+
gps.cleanup = function (callback) {
223223
if (callback) callback();
224224
};
225+
226+
window.TABS.gps = gps;
227+
export {
228+
gps,
229+
};

0 commit comments

Comments
 (0)