Skip to content

Commit

Permalink
branding and logging config
Browse files Browse the repository at this point in the history
  • Loading branch information
tblaha committed Sep 26, 2023
1 parent 7dc8f5d commit 5fefa3c
Show file tree
Hide file tree
Showing 22 changed files with 423 additions and 31 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
6 changes: 3 additions & 3 deletions assets/linux/betaflight-configurator.desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion cordova/package_template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Binary file added docs/assets/images/IndiflightLogoFull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ 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',
macPlist: { 'CFBundleDisplayName': 'Indiflight Configurator'},
winIco: './src/images/if_icon.ico',
zip: false,
};

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down
6 changes: 5 additions & 1 deletion locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@
},

"defaultWelcomeIntro": {
"message": "Welcome to <strong>Betaflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller."
"message": "Welcome to <strong>Indiflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller."
},

"defaultWelcomeHead": {
Expand Down Expand Up @@ -2438,6 +2438,10 @@
"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"
},
"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."
},
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "betaflight-configurator",
"productName": "Betaflight Configurator",
"productName": "Indiflight Configurator",
"description": "Crossplatform configuration tool for Betaflight flight control system.",
"version": "10.10.0",
"main": "main.html",
Expand All @@ -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": [
Expand Down
8 changes: 4 additions & 4 deletions src/components/betaflight-logo/BetaflightLogo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default {
.logo {
height: 70px;
width: 240px;
background-image: url(../../images/light-wide-2.svg);
background-image: url(../../images/if_logo_light.svg);
background-repeat: no-repeat;
background-position: left center;
background-size: contain;
Expand All @@ -53,7 +53,7 @@ export default {
.logo_text {
position: absolute;
left: 80px;
top: 49px;
top: 62px;
color: #949494;
opacity: 0.5;
font-size: 10px;
Expand All @@ -70,7 +70,7 @@ export default {
.logo {
height: 24px;
width: 150px;
background-image: url(../../images/light-wide-2-compact.svg);
background-image: url(../../images/if_logo_light_noLogo.svg);
background-position: left center;
order: 2;
margin-top: 0;
Expand All @@ -80,7 +80,7 @@ export default {
}
.tab_container .logo {
display: block;
background-image: url(../../images/light-wide-2.svg);
background-image: url(../../images/if_logo_light.svg);
background-repeat: no-repeat;
background-position: center 20px;
background-position-x: 12px;
Expand Down
2 changes: 1 addition & 1 deletion src/css/dark-theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ progress[value] {
}
.logowrapper {
img {
content: url(../images/bf_logo_black.svg);
content: url(../images/if_logo_dark.svg);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/css/tabs/cli.less
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
background-color: rgba(0, 0, 0, 0.75);
margin-top: 0;
flex-grow: 1;
background-image: url("../../images/light-wide-1.svg");
background-image: url("../../images/if_logo_gray.svg");
background-repeat: no-repeat;
background-position: 50% 80%;
background-size: 600px;
Expand Down
6 changes: 3 additions & 3 deletions src/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* the need to compile the less files and still can be use in storybook
*/
:root {
--accent: #ffbb00;
--accent: #00a6d6;
--error: red;
--subtleAccent: silver;
--quietText: #ffffff;
Expand All @@ -23,7 +23,7 @@
--switcherysecond: #c4c4c4;
--pushedButton-background: #c4c4c4;
--pushedButton-fontColor: #000000;
--hoverButton-background: #ffcc3e;
--hoverButton-background: #53b9d6;
--superSubtleAccent: #cccccc;
--accentBorder: #ffbb00;
--accentBorder: #00a6d6;
}
Binary file added src/images/if_icon.ico
Binary file not shown.
Binary file added src/images/if_icon_128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/if_icon_128.xcf
Binary file not shown.
99 changes: 99 additions & 0 deletions src/images/if_logo_dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5fefa3c

Please sign in to comment.