diff --git a/README.md b/README.md index e88131167b..540a3c13d5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Betaflight Configurator +# Indiflight Configurator -![Betaflight](http://static.rcgroups.net/forums/attachments/6/1/0/3/7/6/a9088900-228-bf_logo.jpg) +![Indiflight](docs/assets/images/IndiflightLogoFull.png) + +This is a direct fork of the betaflight-configurator, with adaptations to support the Indiflight fork of Betaflight. [![Latest version](https://img.shields.io/github/v/release/betaflight/betaflight-configurator)](https://github.com/betaflight/betaflight-configurator/releases) [![Build](https://img.shields.io/github/actions/workflow/status/betaflight/betaflight-configurator/nightly.yml?branch=master)](https://github.com/betaflight/betaflight-configurator/actions/workflows/nightly.yml) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/betaflight-configurator/localized.svg)](https://crowdin.com/project/betaflight-configurator) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=betaflight_betaflight-configurator&metric=alert_status)](https://sonarcloud.io/dashboard?id=betaflight_betaflight-configurator) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) @@ -11,6 +13,30 @@ It runs as an application under different operating systems and allows you to co Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft. +## tblaha: How to run on Ubuntu 22.04 + +Install the `yarn` package manager via the `npm` package manager, which is in turn installed via the `apt` package manager (...). Also install the correct version of `node` (v16): +```bash +sudo apt install libatomic1 npm +sudo npm install -g gulp-cli yarn +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash +source ~/.bashrc +nvm install 16 +``` + +Clone repo, install dependencies and then compile: +```bash +git clone git@github.com/tblaha/betaflight-configurator +cd betaflight-configurator +git checkout 10.10-pi +yarn install # this installs the dependency node modules +yarn gulp debug # the builds the application using the debug profile and downloads the NWjs +``` + +In the future, you can run with either `yarn gulp debug` or with `./debug/betaflight-configurator/linux64/betaflight-configurator`. + + + ## Authors Betaflight Configurator is a [fork](#credits) of the Cleanflight Configurator with support for Betaflight instead of Cleanflight. diff --git a/assets/android/icon/drawable-hdpi-icon.png b/assets/android/icon/drawable-hdpi-icon.png index 9eb516af7f..b167c149b0 100644 Binary files a/assets/android/icon/drawable-hdpi-icon.png and b/assets/android/icon/drawable-hdpi-icon.png differ diff --git a/assets/android/icon/drawable-ldpi-icon.png b/assets/android/icon/drawable-ldpi-icon.png index 7b423d3d10..037d86edc2 100644 Binary files a/assets/android/icon/drawable-ldpi-icon.png and b/assets/android/icon/drawable-ldpi-icon.png differ diff --git a/assets/android/icon/drawable-mdpi-icon.png b/assets/android/icon/drawable-mdpi-icon.png index 543965c785..ec5c117d8a 100644 Binary files a/assets/android/icon/drawable-mdpi-icon.png and b/assets/android/icon/drawable-mdpi-icon.png differ diff --git a/assets/android/icon/drawable-xhdpi-icon.png b/assets/android/icon/drawable-xhdpi-icon.png index 66c748a362..de995ba019 100644 Binary files a/assets/android/icon/drawable-xhdpi-icon.png and b/assets/android/icon/drawable-xhdpi-icon.png differ diff --git a/assets/android/icon/drawable-xxhdpi-icon.png b/assets/android/icon/drawable-xxhdpi-icon.png index 49cc80f0fa..b223d0c0dc 100644 Binary files a/assets/android/icon/drawable-xxhdpi-icon.png and b/assets/android/icon/drawable-xxhdpi-icon.png differ diff --git a/assets/android/icon/drawable-xxxhdpi-icon.png b/assets/android/icon/drawable-xxxhdpi-icon.png index 85172fe71b..41043a08b8 100644 Binary files a/assets/android/icon/drawable-xxxhdpi-icon.png and b/assets/android/icon/drawable-xxxhdpi-icon.png differ diff --git a/assets/linux/betaflight-configurator.desktop b/assets/linux/betaflight-configurator.desktop index 6fbc6e4699..6e5eed0b41 100644 --- a/assets/linux/betaflight-configurator.desktop +++ b/assets/linux/betaflight-configurator.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -Name=Betaflight Configurator -Comment=Crossplatform configuration tool for the Betaflight flight control system +Name=Indiflight Configurator +Comment=Crossplatform configuration tool for the Indiflight flight control system Exec=/opt/betaflight/betaflight-configurator/betaflight-configurator -Icon=/opt/betaflight/betaflight-configurator/icon/bf_icon_128.png +Icon=/opt/betaflight/betaflight-configurator/icon/if_icon_128.png Terminal=false Type=Application Categories=Utility diff --git a/assets/linux/icon/if_icon_128.png b/assets/linux/icon/if_icon_128.png new file mode 100644 index 0000000000..f19ec53871 Binary files /dev/null and b/assets/linux/icon/if_icon_128.png differ diff --git a/cordova/package_template.json b/cordova/package_template.json index a700c8296e..7872804360 100644 --- a/cordova/package_template.json +++ b/cordova/package_template.json @@ -1,6 +1,6 @@ { "name": "[INJECTED_BY_GULPFILE]", - "displayName": "Betaflight Configurator", + "displayName": "Indiflight Configurator", "version": "[INJECTED_BY_GULPFILE]", "description": "[INJECTED_BY_GULPFILE]", "main": "index.js", diff --git a/docs/assets/images/IndiflightLogoFull.png b/docs/assets/images/IndiflightLogoFull.png new file mode 100644 index 0000000000..8d21039b18 Binary files /dev/null and b/docs/assets/images/IndiflightLogoFull.png differ diff --git a/gulpfile.js b/gulpfile.js index b22e7c51bd..79081ceb9e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -48,9 +48,9 @@ const NAME_REGEX = /-/g; const nwBuilderOptions = { version: '0.77.0', files: `${DIST_DIR}**/*`, - macIcns: './src/images/bf_icon.icns', - macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'}, - winIco: './src/images/bf_icon.ico', + macIcns: './src/images/if_icon.icns', + macPlist: { 'CFBundleDisplayName': 'Indiflight Configurator'}, + winIco: './src/images/if_icon.ico', zip: false, }; @@ -709,7 +709,7 @@ function release_zip(arch, appDirectory) { const output = getReleaseFilename(arch, 'zip', true); const base = path.join(appDirectory, metadata.name, arch); - return compressFiles(src, base, output, 'Betaflight Configurator'); + return compressFiles(src, base, output, 'Indiflight Configurator'); } // Compress files from srcPath, using basePath, to outputFile in the RELEASE_DIR @@ -845,10 +845,10 @@ function release_osx64(appDirectory) { target: path.join(RELEASE_DIR, getReleaseFilename('macOS', 'dmg')), basepath: path.join(appDirectory, metadata.name, 'osx64'), specification: { - title: 'Betaflight Configurator', + title: 'Indiflight Configurator', contents: [ { 'x': 448, 'y': 342, 'type': 'link', 'path': '/Applications' }, - { 'x': 192, 'y': 344, 'type': 'file', 'path': `${metadata.name}.app`, 'name': 'Betaflight Configurator.app' }, + { 'x': 192, 'y': 344, 'type': 'file', 'path': `${metadata.name}.app`, 'name': 'Indiflight Configurator.app' }, ], background: path.join(__dirname, 'assets/osx/dmg-background.png'), format: 'UDZO', diff --git a/locales/en/messages.json b/locales/en/messages.json index 4372c5e8b8..4b9dd24111 100755 --- a/locales/en/messages.json +++ b/locales/en/messages.json @@ -314,6 +314,9 @@ "tabPidTuning": { "message": "PID Tuning" }, + "tabIndi": { + "message": "INDI" + }, "tabReceiver": { "message": "Receiver" }, @@ -683,7 +686,7 @@ }, "defaultWelcomeIntro": { - "message": "Welcome to Betaflight - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller." + "message": "Welcome to Indiflight - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller." }, "defaultWelcomeHead": { @@ -1625,6 +1628,9 @@ "portsFunction_TELEMETRY_MAVLINK": { "message": "MAVLink" }, + "portsFunction_TELEMETRY_PI": { + "message": "PI" + }, "portsFunction_TELEMETRY_MSP": { "message": "MSP" }, @@ -2158,6 +2164,9 @@ "pidTuningSliderModeHelp": { "message": "Pid Tuning Slider Mode

Pidtuning slider mode can be:

• OFF - no sliders, enter values manually
• RP - sliders control Roll and Pitch only, enter Yaw values manually
• RPY - sliders control all PID values

Warning:Going from RP to RPY mode will overwrite Yaw settings with firmware settings." }, + "indiButtonSave": { + "message": "Save and Reboot" + }, "receiverHelp": { "message": "• Always check that your Failsafe is working properly! The settings are in the Failsafe tab, which requires Expert Mode.
• Use the latest Tx firmware!
• Disable the hardware ADC filter in the Transmitter if using OpenTx or EdgeTx.
Basic Setup: Configure the 'Receiver' settings correctly. Choose the correct ‘Channel Map’ for your radio. Check that the Roll, Pitch and other bar graphs move correctly. Adjust the channel endpoint or range values in the transmitter to ~1000 to ~2000, and set the midpoint to 1500. For more information, read the documentation." }, @@ -2435,6 +2444,14 @@ "message": "Added in BF4.4, you can now show 'READY' in the OSD using a switch. This is a niche improvement for racing situations where all pilot video feeds are on one central screen. The pilot can flick a switch to indicate that they are ready to fly, and the word READY appears on their OSD. The race director can then tell if all pilots are ready by looking at the central screen. On arming, the READY text disappears", "description": "Help text to READY mode" }, + "auxiliaryHelpMode_POSITIONCONTROL": { + "message": "Experimental position controller with external position system optitrack", + "description": "Help text to POSITION CONTROL mode" + }, + "auxiliaryHelpMode_VELOCITYCONTROL": { + "message": "Experimental velocity controller with external position system optitrack and sticks as setpoints", + "description": "Help text to VELOCITY CONTROL mode" + }, "adjustmentsHelp": { "message": "Configure adjustment switches. See the 'in-flight adjustments' section of the manual for details. The changes that adjustment functions make are not saved automatically." }, diff --git a/package.json b/package.json index 3824630a6b..f5f4127230 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "betaflight-configurator", - "productName": "Betaflight Configurator", + "productName": "Indiflight Configurator", "description": "Crossplatform configuration tool for Betaflight flight control system.", - "version": "10.10.0", + "version": "10.10.0-indi", "main": "main.html", "chromium-args": "--disable-features=nw2", "scripts": { @@ -20,15 +20,15 @@ "storybook": "start-storybook -p 6006" }, "window": { - "icon": "images/bf_icon_128.png", + "icon": "images/if_icon_128.png", "id": "main-window", "min_width": 1024, "min_height": 550, - "title": "Betaflight Configurator" + "title": "Indiflight Configurator" }, "repository": { "type": "git", - "url": "github.com/betaflight/betaflight-configurator" + "url": "github.com/tblaha/betaflight-configurator" }, "webview": { "partitions": [ diff --git a/src/components/betaflight-logo/BetaflightLogo.vue b/src/components/betaflight-logo/BetaflightLogo.vue index e0ffec226e..c97c6a5e72 100644 --- a/src/components/betaflight-logo/BetaflightLogo.vue +++ b/src/components/betaflight-logo/BetaflightLogo.vue @@ -40,20 +40,20 @@ export default {