Move src files
Bas Delfos
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
240
gulpfile.js
|
|
@ -26,9 +26,9 @@ const RELEASE_DIR = './release/';
|
||||||
var nwBuilderOptions = {
|
var nwBuilderOptions = {
|
||||||
version: '0.27.4',
|
version: '0.27.4',
|
||||||
files: './dist/**/*',
|
files: './dist/**/*',
|
||||||
macIcns: './images/bf_icon.icns',
|
macIcns: './src/images/bf_icon.icns',
|
||||||
macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},
|
macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},
|
||||||
winIco: './images/bf_icon.ico'
|
winIco: './src/images/bf_icon.ico'
|
||||||
};
|
};
|
||||||
|
|
||||||
//-----------------
|
//-----------------
|
||||||
|
|
@ -200,128 +200,128 @@ function clean_cache() {
|
||||||
function dist() {
|
function dist() {
|
||||||
var distSources = [
|
var distSources = [
|
||||||
// CSS files
|
// CSS files
|
||||||
'./main.css',
|
'./src/main.css',
|
||||||
'./tabs/power.css',
|
'./src/tabs/power.css',
|
||||||
'./tabs/firmware_flasher.css',
|
'./src/tabs/firmware_flasher.css',
|
||||||
'./tabs/onboard_logging.css',
|
'./src/tabs/onboard_logging.css',
|
||||||
'./tabs/receiver.css',
|
'./src/tabs/receiver.css',
|
||||||
'./tabs/cli.css',
|
'./src/tabs/cli.css',
|
||||||
'./tabs/servos.css',
|
'./src/tabs/servos.css',
|
||||||
'./tabs/adjustments.css',
|
'./src/tabs/adjustments.css',
|
||||||
'./tabs/configuration.css',
|
'./src/tabs/configuration.css',
|
||||||
'./tabs/auxiliary.css',
|
'./src/tabs/auxiliary.css',
|
||||||
'./tabs/pid_tuning.css',
|
'./src/tabs/pid_tuning.css',
|
||||||
'./tabs/transponder.css',
|
'./src/tabs/transponder.css',
|
||||||
'./tabs/gps.css',
|
'./src/tabs/gps.css',
|
||||||
'./tabs/led_strip.css',
|
'./src/tabs/led_strip.css',
|
||||||
'./tabs/sensors.css',
|
'./src/tabs/sensors.css',
|
||||||
'./tabs/osd.css',
|
'./src/tabs/osd.css',
|
||||||
'./tabs/motors.css',
|
'./src/tabs/motors.css',
|
||||||
'./tabs/receiver_msp.css',
|
'./src/tabs/receiver_msp.css',
|
||||||
'./tabs/logging.css',
|
'./src/tabs/logging.css',
|
||||||
'./tabs/landing.css',
|
'./src/tabs/landing.css',
|
||||||
'./tabs/setup_osd.css',
|
'./src/tabs/setup_osd.css',
|
||||||
'./tabs/help.css',
|
'./src/tabs/help.css',
|
||||||
'./tabs/failsafe.css',
|
'./src/tabs/failsafe.css',
|
||||||
'./tabs/ports.css',
|
'./src/tabs/ports.css',
|
||||||
'./tabs/setup.css',
|
'./src/tabs/setup.css',
|
||||||
'./css/opensans_webfontkit/fonts.css',
|
'./src/css/opensans_webfontkit/fonts.css',
|
||||||
'./css/dropdown-lists/css/style_lists.css',
|
'./src/css/dropdown-lists/css/style_lists.css',
|
||||||
'./css/font-awesome/css/font-awesome.min.css',
|
'./src/css/font-awesome/css/font-awesome.min.css',
|
||||||
'./js/libraries/flightindicators.css',
|
'./src/js/libraries/flightindicators.css',
|
||||||
'./js/libraries/jbox/jBox.css',
|
'./src/js/libraries/jbox/jBox.css',
|
||||||
'./js/libraries/jbox/themes/NoticeBorder.css',
|
'./src/js/libraries/jbox/themes/NoticeBorder.css',
|
||||||
'./js/libraries/jbox/themes/ModalBorder.css',
|
'./src/js/libraries/jbox/themes/ModalBorder.css',
|
||||||
'./js/libraries/jbox/themes/TooltipDark.css',
|
'./src/js/libraries/jbox/themes/TooltipDark.css',
|
||||||
'./js/libraries/jbox/themes/TooltipBorder.css',
|
'./src/js/libraries/jbox/themes/TooltipBorder.css',
|
||||||
'./js/libraries/jquery.nouislider.pips.min.css',
|
'./src/js/libraries/jquery.nouislider.pips.min.css',
|
||||||
'./js/libraries/switchery/switchery.css',
|
'./src/js/libraries/switchery/switchery.css',
|
||||||
'./js/libraries/jquery.nouislider.min.css',
|
'./src/js/libraries/jquery.nouislider.min.css',
|
||||||
|
|
||||||
// JavaScript
|
// JavaScript
|
||||||
'./js/libraries/q.js',
|
'./src/js/libraries/q.js',
|
||||||
'./js/libraries/jquery-2.1.4.min.js',
|
'./src/js/libraries/jquery-2.1.4.min.js',
|
||||||
'./js/libraries/jquery-ui-1.11.4.min.js',
|
'./src/js/libraries/jquery-ui-1.11.4.min.js',
|
||||||
'./js/libraries/d3.min.js',
|
'./src/js/libraries/d3.min.js',
|
||||||
'./js/libraries/jquery.nouislider.all.min.js',
|
'./src/js/libraries/jquery.nouislider.all.min.js',
|
||||||
'./js/libraries/three/three.min.js',
|
'./src/js/libraries/three/three.min.js',
|
||||||
'./js/libraries/three/Projector.js',
|
'./src/js/libraries/three/Projector.js',
|
||||||
'./js/libraries/three/CanvasRenderer.js',
|
'./src/js/libraries/three/CanvasRenderer.js',
|
||||||
'./js/libraries/jquery.flightindicators.js',
|
'./src/js/libraries/jquery.flightindicators.js',
|
||||||
'./js/libraries/semver.js',
|
'./src/js/libraries/semver.js',
|
||||||
'./js/libraries/jbox/jBox.min.js',
|
'./src/js/libraries/jbox/jBox.min.js',
|
||||||
'./js/libraries/switchery/switchery.js',
|
'./src/js/libraries/switchery/switchery.js',
|
||||||
'./js/libraries/bluebird.min.js',
|
'./src/js/libraries/bluebird.min.js',
|
||||||
'./js/libraries/jquery.ba-throttle-debounce.min.js',
|
'./src/js/libraries/jquery.ba-throttle-debounce.min.js',
|
||||||
'./js/libraries/inflection.min.js',
|
'./src/js/libraries/inflection.min.js',
|
||||||
'./js/injected_methods.js',
|
'./src/js/injected_methods.js',
|
||||||
'./js/data_storage.js',
|
'./src/js/data_storage.js',
|
||||||
'./js/workers/hex_parser.js',
|
'./src/js/workers/hex_parser.js',
|
||||||
'./js/fc.js',
|
'./src/js/fc.js',
|
||||||
'./js/port_handler.js',
|
'./src/js/port_handler.js',
|
||||||
'./js/port_usage.js',
|
'./src/js/port_usage.js',
|
||||||
'./js/serial.js',
|
'./src/js/serial.js',
|
||||||
'./js/gui.js',
|
'./src/js/gui.js',
|
||||||
'./js/huffman.js',
|
'./src/js/huffman.js',
|
||||||
'./js/default_huffman_tree.js',
|
'./src/js/default_huffman_tree.js',
|
||||||
'./js/model.js',
|
'./src/js/model.js',
|
||||||
'./js/serial_backend.js',
|
'./src/js/serial_backend.js',
|
||||||
'./js/msp/MSPCodes.js',
|
'./src/js/msp/MSPCodes.js',
|
||||||
'./js/msp.js',
|
'./src/js/msp.js',
|
||||||
'./js/msp/MSPHelper.js',
|
'./src/js/msp/MSPHelper.js',
|
||||||
'./js/backup_restore.js',
|
'./src/js/backup_restore.js',
|
||||||
'./js/peripherals.js',
|
'./src/js/peripherals.js',
|
||||||
'./js/protocols/stm32.js',
|
'./src/js/protocols/stm32.js',
|
||||||
'./js/protocols/stm32usbdfu.js',
|
'./src/js/protocols/stm32usbdfu.js',
|
||||||
'./js/localization.js',
|
'./src/js/localization.js',
|
||||||
'./js/boards.js',
|
'./src/js/boards.js',
|
||||||
'./js/RateCurve.js',
|
'./src/js/RateCurve.js',
|
||||||
'./js/Features.js',
|
'./src/js/Features.js',
|
||||||
'./js/Beepers.js',
|
'./src/js/Beepers.js',
|
||||||
'./js/release_checker.js',
|
'./src/js/release_checker.js',
|
||||||
'./tabs/adjustments.js',
|
'./src/tabs/adjustments.js',
|
||||||
'./tabs/auxiliary.js',
|
'./src/tabs/auxiliary.js',
|
||||||
'./tabs/cli.js',
|
'./src/tabs/cli.js',
|
||||||
'./tabs/configuration.js',
|
'./src/tabs/configuration.js',
|
||||||
'./tabs/failsafe.js',
|
'./src/tabs/failsafe.js',
|
||||||
'./tabs/firmware_flasher.js',
|
'./src/tabs/firmware_flasher.js',
|
||||||
'./tabs/gps.js',
|
'./src/tabs/gps.js',
|
||||||
'./tabs/help.js',
|
'./src/tabs/help.js',
|
||||||
'./tabs/landing.js',
|
'./src/tabs/landing.js',
|
||||||
'./tabs/led_strip.js',
|
'./src/tabs/led_strip.js',
|
||||||
'./tabs/logging.js',
|
'./src/tabs/logging.js',
|
||||||
'./tabs/map.js',
|
'./src/tabs/map.js',
|
||||||
'./tabs/motors.js',
|
'./src/tabs/motors.js',
|
||||||
'./tabs/onboard_logging.js',
|
'./src/tabs/onboard_logging.js',
|
||||||
'./tabs/osd.js',
|
'./src/tabs/osd.js',
|
||||||
'./tabs/pid_tuning.js',
|
'./src/tabs/pid_tuning.js',
|
||||||
'./tabs/ports.js',
|
'./src/tabs/ports.js',
|
||||||
'./tabs/power.js',
|
'./src/tabs/power.js',
|
||||||
'./tabs/receiver.js',
|
'./src/tabs/receiver.js',
|
||||||
'./tabs/receiver_msp.js',
|
'./src/tabs/receiver_msp.js',
|
||||||
'./tabs/sensors.js',
|
'./src/tabs/sensors.js',
|
||||||
'./tabs/servos.js',
|
'./src/tabs/servos.js',
|
||||||
'./tabs/setup.js',
|
'./src/tabs/setup.js',
|
||||||
'./tabs/setup_osd.js',
|
'./src/tabs/setup_osd.js',
|
||||||
'./tabs/transponder.js',
|
'./src/tabs/transponder.js',
|
||||||
'./main.js',
|
'./src/main.js',
|
||||||
|
|
||||||
// everything else
|
// everything else
|
||||||
'./package.json', // For NW.js
|
'./src/eventPage.js',
|
||||||
'./manifest.json', // For Chrome app
|
'./src/*.html',
|
||||||
'./eventPage.js',
|
'./src/tabs/*.html',
|
||||||
'./*.html',
|
'./src/images/**/*',
|
||||||
'./tabs/*.html',
|
'./src/_locales/**/*',
|
||||||
'./images/**/*',
|
'./src/css/font-awesome/fonts/*',
|
||||||
'./_locales/**/*',
|
'./src/css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
|
||||||
'./css/font-awesome/fonts/*',
|
'./src/resources/*.json',
|
||||||
'./css/opensans_webfontkit/*.{eot,svg,ttf,woff,woff2}',
|
'./src/resources/models/*',
|
||||||
'./resources/*.json',
|
'./src/resources/osd/*.mcm',
|
||||||
'./resources/models/*',
|
'./src/resources/motor_order/*.svg',
|
||||||
'./resources/osd/*.mcm',
|
|
||||||
'./resources/motor_order/*.svg',
|
|
||||||
];
|
];
|
||||||
return gulp.src(distSources, { base: '.' })
|
return gulp.src(distSources, { base: 'src' })
|
||||||
|
.pipe(gulp.src('manifest.json', { passthrougth: true }))
|
||||||
|
.pipe(gulp.src('package.json', { passthrougth: true }))
|
||||||
.pipe(gulp.dest(DIST_DIR))
|
.pipe(gulp.dest(DIST_DIR))
|
||||||
.pipe(install({
|
.pipe(install({
|
||||||
npm: '--production --ignore-scripts'
|
npm: '--production --ignore-scripts'
|
||||||
|
|
@ -523,7 +523,7 @@ function release_osx64() {
|
||||||
{ 'x': 448, 'y': 342, 'type': 'link', 'path': '/Applications' },
|
{ 'x': 448, 'y': 342, 'type': 'link', 'path': '/Applications' },
|
||||||
{ 'x': 192, 'y': 344, 'type': 'file', 'path': pkg.name + '.app', 'name': 'Betaflight Configurator.app' }
|
{ 'x': 192, 'y': 344, 'type': 'file', 'path': pkg.name + '.app', 'name': 'Betaflight Configurator.app' }
|
||||||
],
|
],
|
||||||
background: path.join(__dirname, 'images/dmg-background.png'),
|
background: path.join(__dirname, 'assets/osx/dmg-background.png'),
|
||||||
format: 'UDZO',
|
format: 'UDZO',
|
||||||
window: {
|
window: {
|
||||||
size: {
|
size: {
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 434 KiB After Width: | Height: | Size: 434 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 114 KiB |
|
Before Width: | Height: | Size: 117 KiB After Width: | Height: | Size: 117 KiB |
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 119 KiB |
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 113 KiB |
|
Before Width: | Height: | Size: 115 KiB After Width: | Height: | Size: 115 KiB |
|
Before Width: | Height: | Size: 114 KiB After Width: | Height: | Size: 114 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1023 B After Width: | Height: | Size: 1023 B |
|
Before Width: | Height: | Size: 990 B After Width: | Height: | Size: 990 B |
|
Before Width: | Height: | Size: 306 KiB After Width: | Height: | Size: 306 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 737 B After Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 920 B After Width: | Height: | Size: 920 B |
|
Before Width: | Height: | Size: 920 B After Width: | Height: | Size: 920 B |
|
Before Width: | Height: | Size: 943 B After Width: | Height: | Size: 943 B |
|
Before Width: | Height: | Size: 943 B After Width: | Height: | Size: 943 B |
|
Before Width: | Height: | Size: 870 B After Width: | Height: | Size: 870 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |