1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 16:55:24 +03:00

Merge pull request #19 from betaflight/development

Merge development into Master
This commit is contained in:
borisbstyle 2016-06-19 22:03:40 +02:00 committed by GitHub
commit 72743dca69
108 changed files with 1561 additions and 1149 deletions

View file

@ -1,41 +1,41 @@
# Cleanflight Configurator
# Betaflight Configurator
Cleanflight Configurator is a crossplatform configuration tool for the [Cleanflight](http://cleanflight.com/) flight control system.
![Betaflight](http://static.rcgroups.net/forums/attachments/6/1/0/3/7/6/a9088900-228-bf_logo.jpg)
It runs as an app within Google Chrome and allows you to configure the Cleanflight software running on any [supported Cleanflight target](https://github.com/cleanflight/cleanflight/blob/master/docs/Boards.md).
Betaflight Configurator is a crossplatform configuration tool for the Betaflight flight control system.
Various types of aircraft are supported by the tool and by cleanflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft.
It runs as an app within Google Chrome and allows you to configure the Betaflight software running on any [supported Betaflight target](https://github.com/betaflight/betaflight/tree/betaflight/src/main/target).
[![available in the Chrome web store](https://developer.chrome.com/webstore/images/ChromeWebStore_Badge_v2_206x58.png)](https://chrome.google.com/webstore/detail/cleanflight-configurator/enacoimjcgeinfnnnpajinjgmkahmfgb)
Various types of aircraft are supported by the tool and by Betaflight, e.g. quadcopters, hexacopters, octocopters and fixed-wing aircraft.
<!-- soon: ([![available in the Chrome web store](https://developer.chrome.com/webstore/images/ChromeWebStore_Badge_v2_206x58.png)](https://chrome.google.com/webstore/detail/betaflight-configurator/enacoimjcgeinfnnnpajinjgmkahmfgb) -->
## Authors
Dominic Clifton/hydra - maintainer of the Cleanflight firmware and configurator.
Betaflight Configurator is a [fork](#credits) of the Cleanflight Configurator with support for Betaflight instead of Cleanflight.
Cleanflight Configurator was originally a [fork](#credits) of Baseflight Configurator with support for Cleanflight instead of Baseflight.
This configurator is the only configurator with support for Cleanflight specific features. It will likely require that you run the latest firmware on the flight controller.
If you are experiencing any problems please make sure you are running the [latest firmware version](https://github.com/cleanflight/cleanflight/releases/latest).
This configurator is the only configurator with support for Betaflight specific features. It will likely require that you run the latest firmware on the flight controller.
If you are experiencing any problems please make sure you are running the [latest firmware version](https://github.com/betaflight/betaflight/releases/).
## Installation
### Via chrome webstore
### Via chrome webstore (not released yet)
1. Visit [Chrome web store](https://chrome.google.com/webstore/detail/cleanflight-configurator/enacoimjcgeinfnnnpajinjgmkahmfgb)
1. Visit [Chrome web store](https://chrome.google.com/webstore/detail/betaflight-configurator/enacoimjcgeinfnnnpajinjgmkahmfgb)
2. Click **+ Free**
Please note - the application will automatically update itself when new versions are released. Please ensure you maintain configuration backups as described in the Cleanflight documentation.
Please note - the application will automatically update itself when new versions are released. Please ensure you maintain configuration backups as described in the Betaflight documentation.
### Alternative way
1. Clone the repo to any local directory or download it as zip
2. Start Chromium or Google Chrome and go to tools -> extension
3. Check the "Developer mode" checkbox
4. Click on load unpacked extension and point it to the Cleanflight Configurator directory (for example D:/cleanflight-configurator)
4. Click on load unpacked extension and point it to the Betaflight Configurator directory (for example D:/betaflight-configurator)
## How to use
You can find the Cleanflight Configurator icon in your application tab "Apps"
You can find the Betaflight Configurator icon in your application tab "Apps"
## Notes
@ -54,19 +54,13 @@ If you need help your please use the multiwii or rcgroups forums or visit the IR
### Issue trackers
For Cleanflight configurator issues raise them here
For Betaflight configurator issues raise them here
https://github.com/cleanflight/cleanflight-configurator/issues
https://github.com/betaflight/betaflight-configurator/issues
For Cleanflight firmware issues raise them here
For Betaflight firmware issues raise them here
https://github.com/cleanflight/cleanflight/issues
### IRC Channel
There is an IRC channel for Cleanflight, here: irc://irc.freenode.net/#cleanflight
Support for Baseflight Configurator can also be found on IRC, here: irc://irc.freenode.net/#multiwii
https://github.com/betaflight/betaflight/issues
## Technical details
@ -78,4 +72,6 @@ We accept clean and reasonable patches, submit them!
## Credits
ctn - primary author and maintainer of Baseflight Configurator from which this project was forked.
ctn - primary author and maintainer of Baseflight Configurator from which Cleanflight Configurator project was forked.
Hydra - author and maintainer of Cleanflight Configurator from which this project was forked.

View file

@ -35,7 +35,7 @@
"message": "Device - <span style=\"color: red\">Rebooting</span>"
},
"deviceReady": {
"message": "Device - <span style=\"color: #57a929\">Ready</span>"
"message": "Device - <span style=\"color: #ffbb00\">Ready</span>"
},
"backupFileIncompatible": {
@ -122,26 +122,26 @@
},
"serialPortOpened": {
"message": "Serial port <span style=\"color: #57a929\">successfully</span> opened with ID: $1"
"message": "Serial port <span style=\"color: #ffbb00\">successfully</span> opened with ID: $1"
},
"serialPortOpenFail": {
"message": "<span style=\"color: red\">Failed</span> to open serial port"
},
"serialPortClosedOk": {
"message": "Serial port <span style=\"color: #57a929\">successfully</span> closed"
"message": "Serial port <span style=\"color: #ffbb00\">successfully</span> closed"
},
"serialPortClosedFail": {
"message": "<span style=\"color: red\">Failed</span> to close serial port"
},
"usbDeviceOpened": {
"message": "USB device <span style=\"color: #57a929\">successfully</span> opened with ID: $1"
"message": "USB device <span style=\"color: #ffbb00\">successfully</span> opened with ID: $1"
},
"usbDeviceOpenFail": {
"message": "<span style=\"color: red\">Failed</span> to open USB device!"
},
"usbDeviceClosed": {
"message": "USB device <span style=\"color: #57a929\">successfully</span> closed"
"message": "USB device <span style=\"color: #ffbb00\">successfully</span> closed"
},
"usbDeviceCloseFail": {
"message": "<span style=\"color: red\">Failed</span> to close USB device"
@ -171,10 +171,10 @@
"message": "Firmware Version: <strong>$1</strong>"
},
"apiVersionReceived": {
"message": "MultiWii API version <span style=\"color: #57a929\">received</span> - <strong>$1</strong>"
"message": "MultiWii API version <span style=\"color: #ffbb00\">received</span> - <strong>$1</strong>"
},
"uniqueDeviceIdReceived": {
"message": "Unique device ID <span style=\"color: #57a929\">received</span> - <strong>0x$1</strong>"
"message": "Unique device ID <span style=\"color: #ffbb00\">received</span> - <strong>0x$1</strong>"
},
"boardInfoReceived": {
"message": "Board: <strong>$1</strong>, version: <strong>$2</strong>"
@ -216,7 +216,7 @@
"message": "Please use the Firmware Flasher to access DFU devices"
},
"dfu_erased_kilobytes": {
"message": "Erased $1 kB of flash <span style=\"color: #57a929\">successfully</span>"
"message": "Erased $1 kB of flash <span style=\"color: #ffbb00\">successfully</span>"
},
"dfu_device_flash_info": {
"message": "Detected device with total flash size $1 kiB"
@ -226,21 +226,21 @@
},
"eeprom_saved_ok": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"defaultWelcomeIntro": {
"message": "Welcome to <strong>Cleanflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller."
"message": "Welcome to <strong>Betaflight - Configurator</strong>, a utility designed to simplify updating, configuring and tuning of your flight controller."
},
"defaultWelcomeText": {
"message": "The application supports all hardware that can run cleanflight (<a href=\"http://seriouslypro.com/spracingf3\" target=\"_blank\">SPRacingF3</a>, <a href=\"http://www.immersionrc.com/fpv-products/vortex-racing-quad/\" target=\"_blank\">Vortex</a>, <a href=\"https://github.com/TauLabs/TauLabs/wiki/Sparky\" target=\"_blank\">Sparky</a>, <a href=\"http://www.readymaderc.com/store/index.php?main_page=product_info&cPath=76_156&products_id=4221\" target=\"_blank\">DoDo</a>, <a href=\"https://www.openpilot.org/product/coptercontrol/\" target=\"_blank\">CC3D/EVO</a>, <a href=\"http://www.multiwiicopter.com/products/paris-air-hero-32-naze\" target=\"_blank\">Air Hero 32</a>, <a href=\"http://www.readytoflyquads.com/flight-controllers/flip-series\" target=\"_blank\">Flip32/+/Deluxe</a>, <a href=\"http://multirotormania.com/129-dragonfly32\" target=\"_blank\">DragonFly32</a>, <a href=\"http://www.goodluckbuy.com/micro-quadcopter-flight-driver-controller-9dof-9-axis-altitude-sensor-stm32f103.html\" target=\"_blank\">CJMCU Microquad</a>, Chebuzz F3, <a href=\"http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF254044\" target=\"_blank\">STM32F3Discovery</a>, <a href=\"http://www.overskyrc.com/hermit-micro-fpv-brushless-quadcopter-145mm-98g-fully-assembled-p-621.html\" target=\"_blank\">Hermit</a>, <a href=\"http://rcexplorer.se/blog/2015/05/introducing-the-naze32-tricopter-frame/\" target=\"_blank\">Naze32 Tricopter Frame</a>, <a href=\"http://www.2dogrc.com/skyline-32-naze-32-bit-flight-controller-acro-version.html\" target=\"_blank\">Skyline32</a>, <a href=\"http://abusemark.com/store/index.php?main_page=index&cPath=1\" target=\"_blank\">Naze/32/Mini/Pro</a>/<a href=\"http://www.massiverc.com/Shop/en/574-massive-acro-blackbox-flight-control-board.html\" target=\"_blank\">Blackbox</a> etc)<br /><br />The firmware source code can be downloaded from <a href=\"https://github.com/cleanflight/cleanflight\" title=\"www.github.com\" target=\"_blank\">here</a><br />The newest binary firmware image is available <a href=\"https://github.com/cleanflight/cleanflight/releases\" title=\"www.github.com\" target=\"_blank\">here</a>, development builds available <a href=\"http://cleanflight.memoryleaks.org/builds/\" target=\"_blank\">here</a><br /><br />Latest <strong>CP210x Drivers</strong> can be downloaded from <a href=\"http://www.silabs.com/products/mcu/pages/usbtouartbridgevcpdrivers.aspx\" title=\"http://www.silabs.com\" target=\"_blank\">here</a><br />Latest <strong>STM USB VCP Drivers</strong> can be downloaded from <a href=\"http://www.st.com/web/en/catalog/tools/PF257938\" title=\"http://www.st.com\" target=\"_blank\">here</a><br />Latest <strong>Zadig</strong> for Windows DFU flashing can be downloaded from <a href=\"http://zadig.akeo.ie/\" title=\"http://zadig.akeo.ie\" target=\"_blank\">here</a><br />"
"message": "The application supports all hardware that can run Betaflight (<a href=\"http://seriouslypro.com/spracingf3\" target=\"_blank\">SPRacingF3</a>, <a href=\"http://www.immersionrc.com/fpv-products/vortex-racing-quad/\" target=\"_blank\">Vortex</a>, <a href=\"https://github.com/TauLabs/TauLabs/wiki/Sparky\" target=\"_blank\">Sparky</a>, <a href=\"http://www.readymaderc.com/store/index.php?main_page=product_info&cPath=76_156&products_id=4221\" target=\"_blank\">DoDo</a>, <a href=\"https://www.openpilot.org/product/coptercontrol/\" target=\"_blank\">CC3D/EVO</a>, <a href=\"http://www.multiwiicopter.com/products/paris-air-hero-32-naze\" target=\"_blank\">Air Hero 32</a>, <a href=\"http://www.readytoflyquads.com/flight-controllers/flip-series\" target=\"_blank\">Flip32/+/Deluxe</a>, <a href=\"http://multirotormania.com/129-dragonfly32\" target=\"_blank\">DragonFly32</a>, <a href=\"http://www.goodluckbuy.com/micro-quadcopter-flight-driver-controller-9dof-9-axis-altitude-sensor-stm32f103.html\" target=\"_blank\">CJMCU Microquad</a>, Chebuzz F3, <a href=\"http://www.st.com/web/catalog/tools/FM116/SC959/SS1532/PF254044\" target=\"_blank\">STM32F3Discovery</a>, <a href=\"http://www.overskyrc.com/hermit-micro-fpv-brushless-quadcopter-145mm-98g-fully-assembled-p-621.html\" target=\"_blank\">Hermit</a>, <a href=\"http://rcexplorer.se/blog/2015/05/introducing-the-naze32-tricopter-frame/\" target=\"_blank\">Naze32 Tricopter Frame</a>, <a href=\"http://www.2dogrc.com/skyline-32-naze-32-bit-flight-controller-acro-version.html\" target=\"_blank\">Skyline32</a>, <a href=\"http://abusemark.com/store/index.php?main_page=index&cPath=1\" target=\"_blank\">Naze/32/Mini/Pro</a>/<a href=\"http://www.massiverc.com/Shop/en/574-massive-acro-blackbox-flight-control-board.html\" target=\"_blank\">Blackbox</a> etc)<br /><br />The firmware source code can be downloaded from <a href=\"https://github.com/Betaflight/Betaflight\" title=\"www.github.com\" target=\"_blank\">here</a><br />The newest binary firmware image is available <a href=\"https://github.com/Betaflight/Betaflight/releases\" title=\"www.github.com\" target=\"_blank\">here</a>, development builds available <a href=\"http://Betaflight.memoryleaks.org/builds/\" target=\"_blank\">here</a><br /><br />Latest <strong>CP210x Drivers</strong> can be downloaded from <a href=\"http://www.silabs.com/products/mcu/pages/usbtouartbridgevcpdrivers.aspx\" title=\"http://www.silabs.com\" target=\"_blank\">here</a><br />Latest <strong>STM USB VCP Drivers</strong> can be downloaded from <a href=\"http://www.st.com/web/en/catalog/tools/PF257938\" title=\"http://www.st.com\" target=\"_blank\">here</a><br />Latest <strong>Zadig</strong> for Windows DFU flashing can be downloaded from <a href=\"http://zadig.akeo.ie/\" title=\"http://zadig.akeo.ie\" target=\"_blank\">here</a><br />"
},
"defaultContributingHead": {
"message": "Contributing"
},
"defaultContributingText": {
"message": "If you would like to help make Cleanflight even better you can help in many ways, including:<br /><ul><li>Answering other users questions on the forums and IRC.</li><li>Contributing code to the firmware and configurator - new features, fixes, improvements</li><li>Testing <a href=\"https://github.com/cleanflight/cleanflight/pulls\" target=\"_blank\">new features/fixes</a> and providing feedback.</li><li>Helping out with <a href=\"https://github.com/cleanflight/cleanflight/issues\" target=\"_blank\">issues and commenting on feature requests</a>.</li><li><a href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TSQKVT6UYKGL6\" target=\"_blank\" title=\"Donate\">Donating</a>, <a href=\"http://www.bcmultirotors.com/#!/Cleanflight/c/12311211/offset=0&sort=nameAsc\" title=\"www.bcmultirotors.com\" target=\"_blank\">buying a T-Shirt</a> or <a href=\"http://seriouslypro.com/spracingf3\" title=\"seriouslypro.com\" target=\"_blank\">buying an SPRacingF3 board</a></li></ul>"
"message": "If you would like to help make Betaflight even better you can help in many ways, including:<br /><ul><li>Answering other users questions on the forums and IRC.</li><li>Contributing code to the firmware and configurator - new features, fixes, improvements</li><li>Testing <a href=\"https://github.com/Betaflight/Betaflight/pulls\" target=\"_blank\">new features/fixes</a> and providing feedback.</li><li>Helping out with <a href=\"https://github.com/Betaflight/Betaflight/issues\" target=\"_blank\">issues and commenting on feature requests</a>.</li><li><a href=\"https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TSQKVT6UYKGL6\" target=\"_blank\" title=\"Donate\">Donating</a>, <a href=\"http://www.bcmultirotors.com/#!/Betaflight/c/12311211/offset=0&sort=nameAsc\" title=\"www.bcmultirotors.com\" target=\"_blank\">buying a T-Shirt</a> or <a href=\"http://seriouslypro.com/spracingf3\" title=\"seriouslypro.com\" target=\"_blank\">buying an SPRacingF3 board</a></li></ul>"
},
"defaultChangelogHead": {
"message": "Configurator - Changelog"
@ -252,7 +252,7 @@
"message": "Open Source / Donation Notice"
},
"defaultDonateText": {
"message": "This utility is fully <strong>open source</strong> and is available free of charge to all <strong>cleanflight</strong> users.<br />If you found the cleanflight or cleanflight configurator useful, please consider <strong>supporting</strong> its development by donating."
"message": "This utility is fully <strong>open source</strong> and is available free of charge to all <strong>Betaflight</strong> users.<br />If you found the Betaflight or Betaflight configurator useful, please consider <strong>supporting</strong> its development by donating."
},
"defaultSponsorsHead": {
"message": "Sponsors"
@ -261,13 +261,13 @@
"message": "Documentation / Manual"
},
"defaultDocumentation": {
"message": "Cleanflight documentation is available in Markdown and PDF formats.<br /><br />"
"message": "Betaflight documentation is available in Markdown and PDF formats.<br /><br />"
},
"defaultDocumentation1": {
"message": "The PDF manual appropriate to the firmware can be downloaded from the github releases page, <a href=\"https://github.com/cleanflight/cleanflight/releases\" target=\"_blank\">here</a>."
"message": "The PDF manual appropriate to the firmware can be downloaded from the github releases page, <a href=\"https://github.com/Betaflight/Betaflight/releases\" target=\"_blank\">here</a>."
},
"defaultDocumentation2": {
"message": "The Markdown latest online documentation is available <a href=\"https://github.com/cleanflight/cleanflight/tree/master/docs\" target=\"_blank\">here</a> - you can switch to the appropriate version of the documentation by selecting the tag."
"message": "The Markdown latest online documentation is available <a href=\"https://github.com/Betaflight/Betaflight/tree/master/docs\" target=\"_blank\">here</a> - you can switch to the appropriate version of the documentation by selecting the tag."
},
"defaultSupportHead": {
"message": "Support"
@ -288,17 +288,17 @@
"message": "<a href=\"http://www.multiwii.com/forum/viewtopic.php?f=23&t=5149\" target=\"_blank\">MultiWii forums thread</a>"
},
"defaultSupport3": {
"message": "<a href=\"https://github.com/cleanflight\" target=\"_blank\">GitHub</a>"
"message": "<a href=\"https://github.com/Betaflight\" target=\"_blank\">GitHub</a>"
},
"defaultSupport4": {
"message": "<a href=\"irc://irc.freenode.net/#cleanflight\" target=\"_blank\">IRC channel on freenode</a>"
"message": "<a href=\"irc://irc.freenode.net/#Betaflight\" target=\"_blank\">IRC channel on freenode</a>"
},
"defaultSupport5": {
"message": "<a href=\"http://webchat.freenode.net/?channels=cleanflight\" target=\"_blank\">Join via WebClient</a>"
"message": "<a href=\"http://webchat.freenode.net/?channels=Betaflight\" target=\"_blank\">Join via WebClient</a>"
},
"initialSetupBackupAndRestoreApiVersion": {
"message": "<span style=\"color: red\">Backup and restore functionality disabled.</span> You have firmware with API version <span style=\"color: red\">$1</span>, backup and restore requires <span style=\"color: #57a929\">$2</span>. Please backup your settings via the CLI, see Cleanflight documentation for procedure."
"message": "<span style=\"color: red\">Backup and restore functionality disabled.</span> You have firmware with API version <span style=\"color: red\">$1</span>, backup and restore requires <span style=\"color: #ffbb00\">$2</span>. Please backup your settings via the CLI, see Betaflight documentation for procedure."
},
"initialSetupButtonCalibrateAccel": {
"message": "Calibrate Accelerometer"
@ -328,10 +328,10 @@
"message": "<strong>Backup</strong> your configuration in case of an accident, <strong>CLI</strong> settings are <span style=\"color: red\">not</span> included - See 'dump' cli command"
},
"initialSetupBackupSuccess": {
"message": "Backup saved <span style=\"color: #57a929\">successfully</span>"
"message": "Backup saved <span style=\"color: #ffbb00\">successfully</span>"
},
"initialSetupRestoreSuccess": {
"message": "Configuration restored <span style=\"color: #57a929\">successfully</span>"
"message": "Configuration restored <span style=\"color: #ffbb00\">successfully</span>"
},
"initialSetupButtonResetZaxis": {
"message": "Reset Z axis, offset: 0 deg"
@ -430,19 +430,19 @@
"message": "Accelerometer calibration started"
},
"initialSetupAccelCalibEnded": {
"message": "Accelerometer calibration <span style=\"color: #57a929\">finished</span>"
"message": "Accelerometer calibration <span style=\"color: #ffbb00\">finished</span>"
},
"initialSetupMagCalibStarted": {
"message": "Magnetometer calibration started"
},
"initialSetupMagCalibEnded": {
"message": "Magnetometer calibration <span style=\"color: #57a929\">finished</span>"
"message": "Magnetometer calibration <span style=\"color: #ffbb00\">finished</span>"
},
"initialSetupSettingsRestored": {
"message": "Settings restored to <strong>default</strong>"
},
"initialSetupEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"featureRX_PPM": {
@ -687,7 +687,7 @@
"message": "Serial Receiver Provider"
},
"configurationEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"configurationButtonSave": {
"message": "Save and Reboot"
@ -723,6 +723,9 @@
"portsFunction_TELEMETRY_LTM": {
"message": "LTM"
},
"portsFunction_TELEMETRY_MAVLINK": {
"message": "MAVLink"
},
"portsFunction_TELEMETRY_MSP": {
"message": "MSP"
},
@ -737,7 +740,7 @@
},
"pidTuningUpgradeFirmwareToChangePidController": {
"message": "<span style=\"color: red\">Changing PID controller disabled - you can change it via the CLI.</span> You have firmware with API version <span style=\"color: red\">$1</span>, but this functionality requires requires <span style=\"color: #57a929\">$2</span>."
"message": "<span style=\"color: red\">Changing PID controller disabled - you can change it via the CLI.</span> You have firmware with API version <span style=\"color: red\">$1</span>, but this functionality requires requires <span style=\"color: #ffbb00\">$2</span>."
},
"pidTuningName": {
"message": "Name"
@ -751,17 +754,14 @@
"pidTuningDerivative": {
"message": "Derivative"
},
"pidTuningRollPitchRate": {
"message": "ROLL &amp; PITCH rate"
"pidTuningRcRate": {
"message": "RC Rate"
},
"pidTuningRollRate": {
"message": "ROLL rate"
"pidTuningRate": {
"message": "Rate"
},
"pidTuningPitchRate": {
"message": "PITCH rate"
},
"pidTuningYawRate": {
"message": "YAW rate"
"pidTuningRcExpo": {
"message": "RC Expo"
},
"pidTuningTPA": {
"message": "TPA"
@ -769,6 +769,12 @@
"pidTuningTPABreakPoint": {
"message": "TPA Breakpoint"
},
"rcCurve": {
"message": "RC Curve"
},
"rcYawCurve": {
"message": "RC Yaw Curve"
},
"pidTuningButtonSave": {
"message": "Save"
},
@ -782,13 +788,13 @@
"message": "PID Controller"
},
"pidTuningLoadedProfile": {
"message": "Loaded Profile: <strong style=\"color: #57a929\">$1</strong>"
"message": "Loaded Profile: <strong style=\"color: #ffbb00\">$1</strong>"
},
"pidTuningDataRefreshed": {
"message": "PID data <strong>refreshed</strong>"
},
"pidTuningEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"receiverHelp": {
@ -800,9 +806,6 @@
"receiverThrottleExpo": {
"message": "Throttle EXPO"
},
"receiverRcRate": {
"message": "RC Rate"
},
"receiverDeadband": {
"message": "RC Deadband"
},
@ -815,12 +818,6 @@
"receiverYawDeadband": {
"message": "Yaw Deadband"
},
"receiverRcExpo": {
"message": "RC Expo"
},
"receiverRcYawExpo": {
"message": "RC Yaw Expo"
},
"receiverChannelMap": {
"message": "Channel Map"
},
@ -846,7 +843,7 @@
"message": "RC Tuning data <strong>refreshed</strong>"
},
"receiverEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"auxiliaryHelp": {
@ -865,7 +862,7 @@
"message": "Save"
},
"auxiliaryEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"adjustmentsHelp": {
@ -1037,7 +1034,7 @@
"message": "Save"
},
"adjustmentsEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"transponderNotSupported": {
@ -1065,7 +1062,7 @@
"message": "Transponder data is <span style=\"color: red\">invalid</span>"
},
"transponderEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"servosFirmwareUpgradeRequired": {
@ -1108,7 +1105,7 @@
"message": "Reverse"
},
"servosEepromSave": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"gpsHead": {
@ -1412,13 +1409,13 @@
"message": "Warning"
},
"firmwareFlasherWarningText": {
"message": "Please do <span style=\"color: red\">not</span> try to flash <strong>non-cleanflight</strong> hardware with this firmware flasher.<br />Do <span style=\"color: red\">not</span> <strong>disconnect</strong> the board or <strong>turn off</strong> your computer while flashing.<br /><br /><strong>Note: </strong>STM32 bootloader is stored in ROM, it cannot be bricked.<br /><strong>Note: </strong><span style=\"color: red\">Auto-Connect</span> is always disabled while you are inside firmware flasher.<br /><strong>Note: </strong>Make sure you have a backup; some upgrades/downgrades will wipe your configuration.<br /><strong>Note:</strong> If you have problems flashing try disconnecting all cables from your FC first, try rebooting, upgrade chrome, upgrade drivers.<br /><strong>Note:</strong> When flashing boards that have directly connected USB sockets (SPRacingF3Mini, Sparky, ColibriRace, etc) ensure you have read the USB Flashing section of the Cleanflight manual and have the correct software and drivers installed"
"message": "Please do <span style=\"color: red\">not</span> try to flash <strong>non-Betaflight</strong> hardware with this firmware flasher.<br />Do <span style=\"color: red\">not</span> <strong>disconnect</strong> the board or <strong>turn off</strong> your computer while flashing.<br /><br /><strong>Note: </strong>STM32 bootloader is stored in ROM, it cannot be bricked.<br /><strong>Note: </strong><span style=\"color: red\">Auto-Connect</span> is always disabled while you are inside firmware flasher.<br /><strong>Note: </strong>Make sure you have a backup; some upgrades/downgrades will wipe your configuration.<br /><strong>Note:</strong> If you have problems flashing try disconnecting all cables from your FC first, try rebooting, upgrade chrome, upgrade drivers.<br /><strong>Note:</strong> When flashing boards that have directly connected USB sockets (SPRacingF3Mini, Sparky, ColibriRace, etc) ensure you have read the USB Flashing section of the Betaflight manual and have the correct software and drivers installed"
},
"firmwareFlasherRecoveryHead": {
"message": "<strong>Recovery / Lost communication<strong>"
},
"firmwareFlasherRecoveryText": {
"message": "If you have lost communication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Install all STM32 drivers and Zadig if required (see <a href=\"https://github.com/cleanflight/cleanflight/blob/master/docs/USB%20Flashing.md\"target=\"_blank\">USB Flashing</a> section of cleanflight manual).</li><li>Close configurator, Close all running chrome instances, Close all Chrome apps, Restart Configurator.</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
"message": "If you have lost communication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Install all STM32 drivers and Zadig if required (see <a href=\"https://github.com/Betaflight/Betaflight/blob/master/docs/USB%20Flashing.md\"target=\"_blank\">USB Flashing</a> section of Betaflight manual).</li><li>Close configurator, Close all running chrome instances, Close all Chrome apps, Restart Configurator.</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
},
"firmwareFlasherButtonLeave": {
"message": "Leave Firmware Flasher"
@ -1430,20 +1427,20 @@
"message": "HEX file appears to be corrupted"
},
"firmwareFlasherRemoteFirmwareLoaded": {
"message": "<span style=\"color: #57a929\">Remote Firmware loaded, ready for flashing</span>"
"message": "<span style=\"color: #ffbb00\">Remote Firmware loaded, ready for flashing</span>"
},
"firmwareFlasherFailedToLoadOnlineFirmware": {
"message": "Failed to load remote firmware"
},
"ledStripHelp": {
"message": "The flight controller can control colors and effects of individual LEDs on a strip.<br />Configure LEDs on the grid, configure wiring order then attach LEDs on your aircraft according to grid positions."
"message": "The flight controller can control colors and effects of individual LEDs on a strip. Configure LEDs on the grid, configure wiring order then attach LEDs on your aircraft according to grid positions. LEDs without wire ordering number will not be saved."
},
"ledStripButtonSave": {
"message": "Save"
},
"ledStripEepromSaved": {
"message": "EEPROM <span style=\"color: #57a929\">saved</span>"
"message": "EEPROM <span style=\"color: #ffbb00\">saved</span>"
},
"controlAxisRoll": {
@ -1538,7 +1535,7 @@
"message": "Arbitrary board rotation in degrees, to allow mounting it sideways / upside down / rotated etc. When running external sensors, use the sensor alignments (Gyro, Acc, Mag) to define sensor position independent from board orientation. "
},
"failsafeFeaturesHelpOld": {
"message": "Failsafe configuration has changed considerably. Use Cleanflight <strong>v1.12.0+</strong> to enable the improved configuration panel."
"message": "Failsafe configuration has changed considerably. Use Betaflight <strong>v1.12.0+</strong> to enable the improved configuration panel."
},
"failsafePaneTitleOld": {
"message": "Receiver failsafe"
@ -1620,5 +1617,14 @@
},
"failsafeKillSwitchHelp": {
"message": "Set this option to make the failsafe switch, configured in the modes tab, act as a direct kill switch, bypassing the selected failsafe procedure. <strong>Note:</strong> Arming is blocked with the failsafe kill switch in the ON position"
},
"mainHelpArmed": {
"message": "Motor Arming"
},
"mainHelpFailsafe": {
"message": "Failsafe Mode"
},
"mainHelpLink": {
"message": "Serial Link Status"
}
}

View file

@ -1,4 +1,9 @@
<span>2015.12.15 - 1.2.1 - cleanflight</span>
<span>2016.05.12 - 1.2.2 - cleanflight</span>
<ul>
<li>Better support for some USB VCP targets.</li>
<li>Support for MAVLink telemetry.</li>
</ul>
<span>2016.02.22 - 1.2.1 - cleanflight</span>
<ul>
<li>Add links to STM VCP Drivers and Zadig.</li>
<li>Update recovery procedure on Firmware Flasher page.</li>

View file

@ -14,10 +14,6 @@ function startApplication() {
minHeight: 550
}
}, function (createdWindow) {
createdWindow.contentWindow.addEventListener('load', function () {
createdWindow.contentWindow.catch_startup_time(applicationStartTime);
});
createdWindow.onClosed.addListener(function () {
// automatically close the port when application closes
// save connectionId in separate variable before createdWindow.contentWindow is destroyed
@ -113,4 +109,4 @@ chrome.notifications.onButtonClicked.addListener(function (notificationId, butto
if (notificationId == 'baseflight_update') {
startApplication();
}
});
});

View file

@ -1,15 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.0" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="235 -236.3 612 612" enable-background="new 235 -236.3 612 612" xml:space="preserve">
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="164 -236.3 612 612" style="enable-background:new 164 -236.3 612 612;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFBB00;}
</style>
<g>
<g id="Right">
<g>
<path fill="#59AA29" d="M512.6-56.6L512.6-56.6c-5.2-4.6-11.9-7.6-19.4-7.6c-15.8,0-28.7,12.9-28.7,28.7c0,8.4,3.6,15.8,9.4,21.1
<path class="st0" d="M441.6-57.9L441.6-57.9c-5.2-4.6-11.9-7.6-19.4-7.6c-15.8,0-28.7,12.9-28.7,28.7c0,8.4,3.6,15.8,9.4,21.1
l-0.1,0.1l91.7,84l-91.7,84.1l0.1,0.1c-5.7,5.2-9.4,12.7-9.4,21.1c0,15.8,12.9,28.7,28.7,28.7c7.5,0,14.2-2.9,19.3-7.6l0.1,0.1
L627.3,90.9c5.9-5.5,9.3-13.1,9.3-21.2s-3.4-15.7-9.3-21.2L512.6-56.6z M541-236.3c-169,0-306,137-306,306s137,306,306,306
s306-137,306-306S710-236.3,541-236.3z M541,318.4c-137.1,0-248.6-111.5-248.6-248.6S403.9-178.9,541-178.9
S789.6-67.4,789.6,69.7S678.1,318.4,541,318.4z"/>
L556.3,89.6c5.9-5.5,9.3-13.1,9.3-21.2s-3.4-15.7-9.3-21.2L441.6-57.9z M470-237.6c-169,0-306,137-306,306s137,306,306,306
s306-137,306-306S639-237.6,470-237.6z M470,317.1c-137.1,0-248.6-111.5-248.6-248.6S332.9-180.2,470-180.2
S718.6-68.7,718.6,68.4S607.1,317.1,470,317.1z"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 962 B

After

Width:  |  Height:  |  Size: 1,023 B

Before After
Before After

BIN
images/bf_icon_128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
images/bf_icon_128.psd Normal file

Binary file not shown.

View file

@ -1,27 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.0" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="141.7px" height="18.2px" viewBox="0 0 141.7 18.2" enable-background="new 0 0 141.7 18.2" xml:space="preserve">
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-70 61.5 141.7 18.2" style="enable-background:new -70 61.5 141.7 18.2;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFBB00;}
.st1{fill:#424242;}
.st2{fill:#3A3A3A;}
</style>
<g>
<path fill="#FFFFFF" d="M56.8,4.9V4.7l-0.1-0.4c-0.4-0.8-1.2-1.1-2.5-1.1l-5.1,0c-0.5,0-1,0.2-1.5,0.4c0,0,0,0,0,0
c-0.2,0.1-0.4,0.2-0.6,0.3c0,0,0,0,0,0c-0.3,0.1-0.7,0.4-1.1,0.8c0,0,0,0,0,0c-0.1,0.1-0.3,0.3-0.4,0.4c-0.1,0.1-0.1,0.1-0.2,0.2
c-0.1,0.1-0.2,0.2-0.3,0.4c0,0,0,0.1-0.1,0.1c0,0,0,0,0,0c-0.2,0.3-1.4,2.4-3.7,6.3h-9.6c0.2-0.5,0.5-1,1-1.7h2
c0.1,0,1.5-0.8,4.1-2.3V8h-4.7l1-1.8h6.9l4.9-2.9V3.2H33.2l-5,8.8H19l5-8.7V3.2h-2.6v0h-9.8C9.6,3.2,8,4,6.6,5.6l-2.7,4.6
c-1,1.5-1.5,2.6-1.5,3.2c0,0.3,0.1,0.5,0.1,0.6c0.2,0.7,0.9,1,1.9,1H6l0.4,0l0.5,0h6.3c0.1,0,0.6-1,1.7-2.9h0l0,0H8.1l-0.4,0
l-0.1,0c-0.4,0-0.7-0.2-0.7-0.6c0-0.4,0.4-1.1,1.1-2.3c1-2,2.1-2.9,3.2-2.9h5.3l3.8-2.3l-3.1,5.4C15,13,14,15,14,15h10.1l3.5-2
l-1.1,2h0l0,0h12.9h0.1h0.5h2.6h0.2l0,0c1-1.9,1.6-2.8,1.7-2.9h5v0.1l-0.6,1l-1,1.8l0,0l0,0h0.1h3h0.2c0.1-0.1,1.5-2.5,4.2-7.2
C56.4,6.4,56.8,5.4,56.8,4.9z M46.6,8.4c0.7-1.5,1.7-2.2,3-2.2h1.7c0.4,0,0.7,0,0.9,0.1c0.1,0,0.1,0.1,0.2,0.1c0,0,0,0,0,0
c0.1,0,0.1,0.1,0.1,0.2c0,0,0,0,0,0v0.3c0,0.2-0.4,0.9-1.1,2c0,0.1-0.1,0.2-0.3,0.2h-4.9C46.2,9.1,46.3,8.8,46.6,8.4z"/>
<path fill="#FFFFFF" d="M69.2,4.8L69.2,4.8c0-0.3,0-0.5-0.1-0.6c-0.4-0.6-1.2-0.9-2.4-0.9v0h-8l-3.4,5.9C53.1,13,52,15,52,15h3.3
c0.1-0.1,1.8-3,5.1-8.8h3.9c0.5,0,0.7,0.2,0.7,0.5v0.1c0,0.2-0.1,0.4-0.2,0.6L60.4,15v0h3.3c0.4-0.7,1.8-3.1,4.1-7.2
C68.8,6.4,69.2,5.3,69.2,4.8z"/>
<path fill="#FFFFFF" d="M99.8,3.2h-3.3c-2.2,3.9-3.8,6.8-4.9,8.8h-9.1l5-8.7V3.2h-2.8v0H71.3L64.5,15v0h3.3c1.2-2,2.1-3.6,2.6-4.7
h2.2l4-2.3V8h-4.7c0.7-1.2,1-1.8,1.1-1.8h6.9l3.9-2.3l-3.1,5.5C78.5,13,77.4,15,77.4,15h10.1l3.4-2c-0.6,1.1-1,1.8-1.1,2h3.3
L99.8,3.2L99.8,3.2z"/>
<path fill="#FFFFFF" d="M135.7,3.1h-8.1l-3.2,1.9l1-1.8l-0.1-0.1h-3.2L119.4,8l-3.8,0h-1.3l2.6-4.7V3.2v0h-3.3l0,0H104
c-1.6,0-3,0.6-4.4,1.9c-0.6,0.7-1.6,2.4-3.1,5c-1.1,1.6-1.6,2.8-1.6,3.4c0,1,0.7,1.5,2.2,1.5h8.5l3.9-7h0l0,0h-5.6l-4,2.3v0.1h5
c-0.6,1.1-0.9,1.7-1,1.7h-3.7c-0.5-0.1-0.8-0.3-0.8-0.6v-0.3c0.1-0.4,0.4-1.1,1.1-2.1c1-1.9,2-2.9,3.2-2.9h5.3l4.6-2.7l-3.7,6.4
c-1.7,3-2.7,4.8-2.9,5.1h3.3l2.7-4.7h5v0c-1.7,3-2.6,4.5-2.6,4.6l3.3,0h0l5-8.8h3.7l-5,8.8v0h3.3c0.1,0,1.7-2.9,5-8.8h3.2l4.9-3
V3.2L135.7,3.1z"/>
<g>
<path class="st0" d="M-19.5,70.1h4.1c2,0,2,1.1,1.7,1.9s-0.8,1.2-1.4,1.5c0.6,0.2,1,0.8,0.6,1.9c-0.5,1.5-2.1,2.3-3.4,2.3h-4.2
L-19.5,70.1z M-19.2,75.8h1.4c0.5,0,0.9-0.1,1.2-0.7c0.2-0.4,0-0.7-0.6-0.7h-1.4L-19.2,75.8z M-18.2,73h1.2c0.5,0,0.8-0.1,1-0.6
c0.1-0.4-0.1-0.5-0.6-0.5h-1.2L-18.2,73z"/>
<path class="st0" d="M-11.6,70.1h6.2L-6.1,72H-10l-0.3,0.9h3.5l-0.6,1.8h-3.5l-0.3,0.9h4l-0.7,1.9h-6.3L-11.6,70.1z"/>
<path class="st0" d="M-3.2,72h-2.1l0.7-1.9h6.5L1.2,72h-2.1l-2,5.6h-2.3L-3.2,72z"/>
<path class="st0" d="M4,70.1h2.3l0.1,7.5H3.9L4,76.5H1.6l-0.7,1.1h-2.3L4,70.1z M4.1,74.9l0.1-2.3l0,0l-1.5,2.3H4.1z"/>
<path class="st1" d="M9.6,70.1h5.8L14.7,72h-3.5l-0.3,0.9h3l-0.6,1.8h-3l-1,2.9H7L9.6,70.1z"/>
<path class="st1" d="M16.3,70.1h2.3l-2,5.6h3.3l-0.7,1.9h-5.6L16.3,70.1z"/>
<path class="st1" d="M22.7,70.1H25l-2.7,7.5H20L22.7,70.1z"/>
<path class="st1" d="M29.4,76.8c-0.7,0.7-1.6,0.9-2.5,0.9c-2.2,0-3-1.7-2.2-3.8c1-2.9,3.4-4,5.1-4c1.9,0,2.7,1,2.5,2.8h-2.2
c0.1-0.5-0.2-0.9-0.8-0.9c-1.6,0-2.1,1.7-2.3,2.2c-0.2,0.7-0.4,1.9,1,1.9c0.5,0,1.2-0.3,1.5-0.8h-1l0.6-1.6h3.1l-1.5,4.1h-1.5
L29.4,76.8z"/>
<path class="st1" d="M34.6,70.1h2.3L36,72.7h2.2l0.9-2.6h2.3l-2.7,7.5h-2.3l1.1-3h-2.2l-1.1,3h-2.3L34.6,70.1z"/>
<path class="st1" d="M43.6,72h-2.1l0.7-1.9h6.5L48,72h-2.1l-2,5.6h-2.3L43.6,72z"/>
</g>
<g>
<path class="st0" d="M-36.4,73.5c0,0-2.5,1.2-1.7,3.5c0.9,2.6,5.3,2.3,7.9,1.2c2.2-0.9,0.4-1.6,0.4-1.6l-2.3-1.3l-3.4-2.1
L-36.4,73.5z"/>
<path class="st2" d="M-30.3,75.5c-1.7-0.7-2.9-1.7-4-2.2c0.6-0.3,1.2-0.7,1.6-1c0.4-0.4,0.5-0.8,0.5-1.3c1.2,0.8,2.7,0.9,3.5,0.9
c0.8,0,1.5,0.2,1.7,0.6c0,0,0.2-4.2-8.4-7c0,0,2.6,1.2,3.4,2.1c0,0-0.9-0.1-1.3,0.5c-0.2,0.3-0.2,0.8-0.1,1.3
c-0.1,0-0.3,0-0.5-0.1l-13.7-7.6l1.4,3.1l-1.4-0.5l0.4,0.8c0,0,0.6,1.1,1.9,3.4c1,1.8,2.9,2.7,5.4,2.6c0.1,0,0.2,0,0.3,0
c0.6,0,1.6-0.1,2.5-0.2c-0.1,0.3-0.1,0.7,0,1.2c0.1,0.6,0.3,0.9,0.6,1.2c-0.7,0.3-1.4,1-1.7,1.8c0,0,0,0,0,0c0,0,0,0,0,0.1
c0,0,0,0,0,0c-0.2,0.5-0.3,1.1,0,1.8c0,0,0,0,0,0c0,0.1,0.1,0.3,0.2,0.4c0.1,0.1,0.2,0.3,0.3,0.4c1.5,1.8,5.3,1.5,7.6,0.5
c0,0,0.1,0,0.1,0c0.2-0.1,0.4-0.2,0.6-0.3c0,0,0.1,0,0.1-0.1c0.2-0.1,0.4-0.2,0.6-0.3c2.3-1.4,3.1-2.9,3.1-2.9
S-28.1,76.5-30.3,75.5z M-29.7,69.3c0.7,0.3,1.7,1.9,1.7,1.9c-0.8-0.1-2.5-0.7-2.7-1.3S-30.4,69-29.7,69.3z M-40.1,70.5
c-0.9,0-1.7-0.1-2.4-0.3c-1-0.4-1.8-1-2.3-2c-0.7-1.2-1.2-2-1.5-2.6l1.2,0.4l-1.2-2.7l10.8,6c-0.3,0-0.6,0.1-0.9,0.3l-6.9-2.8
l6,3.4C-38.4,70.4-39.5,70.5-40.1,70.5z M-38.1,76.7c-0.1-0.5-0.1-0.9,0-1.3c0.6,0.4,1.6,0.7,2.9,0.2
C-35.1,75.5-36.1,76.7-38.1,76.7z M-34.9,78.9c-0.4-0.1-0.9-0.2-1.3-0.3c-0.2-0.1-0.4-0.2-0.6-0.3c0.9-0.2,2-0.7,3-1.9
C-33.8,76.4-33.9,77.7-34.9,78.9z M-31.9,78.6c-0.2,0.1-0.5,0.1-0.7,0.2c0.4-0.3,0.8-0.7,0.8-1.4C-31.8,77.4-31.6,78.2-31.9,78.6z
M-28.7,77.1c-0.1-0.3-0.2-0.9-0.2-0.9c0.7,0.1,1.6-0.2,1.6-0.2C-27.9,76.6-28.7,77.1-28.7,77.1z"/>
<path class="st0" d="M-34.1,69.8c0,0-2.5-0.6-2.9,1.3c-0.1,0.8,0.2,1.5,0.6,1.8c0.2-0.1,0.5-0.2,1-0.2c-0.1,0-0.3-0.3-0.4-0.6
c0.2,0,0.4,0.1,0.6,0c0,0-0.6-0.2-0.8-0.9c0,0,0,0,0,0c0.1,0.1,0.2,0.1,0.3,0.1c0,0-0.5-0.4-0.1-0.9C-35.5,70.1-35,69.8-34.1,69.8
z"/>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-173 349.9 264.9 95.1" style="enable-background:new -173 349.9 264.9 95.1;" xml:space="preserve">
viewBox="-9 23.6 264.9 95.1" style="enable-background:new -9 23.6 264.9 95.1;" xml:space="preserve">
<style type="text/css">
.st0{fill:#71B221;}
.st0{fill:#FFBB00;}
.st1{fill:none;}
.st2{enable-background:new ;}
.st3{fill:none;stroke:#1B171B;stroke-miterlimit:10;}
@ -11,37 +11,38 @@
.st5{fill:#B8B8B9;}
</style>
<g>
<path class="st0" d="M-157.2,418.3c-4.7,0-8.5,3.8-8.5,8.5c0,4.7,5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6
C-148.7,422.1-152.5,418.3-157.2,418.3z M-153.9,429.9h-1.9v-2.2h-2.9v2.2h-1.9v-6.2h1.9v2.2h2.9v-2.2h1.9V429.9z"/>
<path class="st0" d="M6.8,90.9c-4.7,0-8.5,3.8-8.5,8.5S3.5,108,6.8,111c2.7-2.7,8.5-7,8.5-11.6C15.3,94.7,11.5,90.9,6.8,90.9z
M10.1,102.5H8.2v-2.2H5.3v2.2H3.4v-6.2h1.9v2.2h2.9v-2.2h1.9V102.5z"/>
<g>
<rect x="16.7" y="382" class="st1" width="67.5" height="13.5"/>
<rect x="180.7" y="54.6" class="st1" width="67.5" height="13.5"/>
<g class="st2">
<path d="M26.1,387.5c0,1.6-0.4,2.9-1.3,3.8c-0.9,0.9-2.2,1.3-3.9,1.3h-2.8v-10h3.1c1.6,0,2.8,0.4,3.6,1.3S26.1,386,26.1,387.5z
M24.9,387.6c0-1.3-0.3-2.3-1-2.9c-0.7-0.7-1.6-1-2.9-1h-1.7v8h1.4c1.4,0,2.4-0.3,3.1-1C24.5,389.9,24.9,388.9,24.9,387.6z"/>
<path d="M31.6,385c0.3,0,0.6,0,0.9,0.1l-0.2,1.1c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1v-7.5
h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1C30.7,385.1,31.1,385,31.6,385z"/>
<path d="M40.3,388.9c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4
c-0.3-0.6-0.4-1.3-0.4-2.1c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1c1,0,1.9,0.3,2.5,1C40,386.7,40.3,387.7,40.3,388.9z
M34.6,388.9c0,1,0.2,1.7,0.6,2.2s0.9,0.8,1.7,0.8c0.7,0,1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2c0-1-0.2-1.7-0.6-2.2
c-0.4-0.5-1-0.7-1.7-0.7c-0.7,0-1.3,0.2-1.7,0.7C34.8,387.2,34.6,387.9,34.6,388.9z"/>
<path d="M45.8,392.8c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8h-0.1c0.1,0.4,0.1,0.9,0.1,1.2v3.1h-1.1v-10.9h0.9l0.2,1h0.1
<path d="M190.1,60.1c0,1.6-0.4,2.9-1.3,3.8c-0.9,0.9-2.2,1.3-3.9,1.3h-2.8v-10h3.1c1.6,0,2.8,0.4,3.6,1.3S190.1,58.6,190.1,60.1z
M188.9,60.2c0-1.3-0.3-2.3-1-2.9c-0.7-0.7-1.6-1-2.9-1h-1.7v8h1.4c1.4,0,2.4-0.3,3.1-1C188.5,62.5,188.9,61.5,188.9,60.2z"/>
<path d="M195.6,57.6c0.3,0,0.6,0,0.9,0.1l-0.2,1.1c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1
v-7.5h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1C194.7,57.7,195.1,57.6,195.6,57.6z"/>
<path d="M204.3,61.5c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4
c-0.3-0.6-0.4-1.3-0.4-2.1c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1C204,59.3,204.3,60.3,204.3,61.5z
M198.6,61.5c0,1,0.2,1.7,0.6,2.2c0.4,0.5,0.9,0.8,1.7,0.8c0.7,0,1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2
c-0.4-0.5-1-0.7-1.7-0.7c-0.7,0-1.3,0.2-1.7,0.7C198.8,59.8,198.6,60.5,198.6,61.5z"/>
<path d="M209.8,65.4c-0.5,0-0.9-0.1-1.3-0.3c-0.4-0.2-0.7-0.5-1-0.8h-0.1c0.1,0.4,0.1,0.9,0.1,1.2v3.1h-1.1V57.7h0.9l0.2,1h0.1
c0.3-0.4,0.6-0.7,1-0.9c0.4-0.2,0.8-0.3,1.3-0.3c1,0,1.8,0.3,2.3,1s0.8,1.6,0.8,2.9c0,1.2-0.3,2.2-0.8,2.9
C47.5,392.4,46.8,392.8,45.8,392.8z M45.6,386c-0.8,0-1.3,0.2-1.7,0.6s-0.5,1.1-0.5,2v0.3c0,1.1,0.2,1.8,0.5,2.3
c0.4,0.5,0.9,0.7,1.7,0.7c0.6,0,1.2-0.3,1.5-0.8c0.4-0.5,0.5-1.2,0.5-2.2c0-0.9-0.2-1.7-0.5-2.1C46.8,386.2,46.3,386,45.6,386z"
/>
C211.5,65,210.8,65.4,209.8,65.4z M209.6,58.6c-0.8,0-1.3,0.2-1.7,0.6c-0.4,0.4-0.5,1.1-0.5,2v0.3c0,1.1,0.2,1.8,0.5,2.3
c0.4,0.5,0.9,0.7,1.7,0.7c0.6,0,1.2-0.3,1.5-0.8c0.4-0.5,0.5-1.2,0.5-2.2c0-0.9-0.2-1.7-0.5-2.1
C210.8,58.8,210.3,58.6,209.6,58.6z"/>
</g>
<line class="st3" x1="-167.8" y1="441.3" x2="87.2" y2="441.3"/>
<polygon points="78.7,432.6 65.4,436.2 74.7,411.2 53.4,439.9 23.4,435.2 42.7,441.2 70.1,441.2 "/>
<line class="st3" x1="-3.8" y1="113.9" x2="251.2" y2="113.9"/>
<polygon points="242.7,105.2 229.4,108.8 238.7,83.8 217.4,112.5 187.4,107.8 206.7,113.8 234.1,113.8 "/>
<g>
<g>
<path class="st0" d="M51.9,428.6c-2.5-0.9-5.1,0-6.7,1.9l-22.1-7.7l-1.3,3.8l22.1,7.7c0,2.5,1.5,4.8,4,5.6
c3.1,1.1,6.6-0.6,7.6-3.7C56.5,433.1,55.1,429.7,51.9,428.6z"/>
<path class="st4" d="M12.9,407.5c-6.8-2.4-14.1-0.1-18.4,5.2l-20.7-7.2c0-2.5-1.6-4.8-4-5.6c-3.1-1.1-6.6,0.6-7.6,3.7
c-1.1,3.1,0.6,6.6,3.7,7.6c2.5,0.9,5.1,0,6.7-1.9l19.8,6.9l30.1,10.5l1.2,0.4C25.5,418.9,21,410.4,12.9,407.5z"/>
<path class="st0" d="M215.9,101.2c-2.5-0.9-5.1,0-6.7,1.9l-22.1-7.7l-1.3,3.8l22.1,7.7c0,2.5,1.5,4.8,4,5.6
c3.1,1.1,6.6-0.6,7.6-3.7C220.5,105.7,219.1,102.3,215.9,101.2z"/>
<path class="st4" d="M176.9,80.1c-6.8-2.4-14.1-0.1-18.4,5.2l-20.7-7.2c0-2.5-1.6-4.8-4-5.6c-3.1-1.1-6.6,0.6-7.6,3.7
c-1.1,3.1,0.6,6.6,3.7,7.6c2.5,0.9,5.1,0,6.7-1.9l19.8,6.9l30.1,10.5l1.2,0.4C189.5,91.5,185,83,176.9,80.1z"/>
</g>
<rect x="-52.9" y="396.3" transform="matrix(0.944 0.3299 -0.3299 0.944 129.5555 32.1182)" class="st5" width="46" height="2.9"/>
<rect x="28.8" y="424.9" transform="matrix(0.944 0.3299 -0.3299 0.944 143.564 6.7675)" class="st5" width="46" height="2.9"/>
<rect x="111.1" y="68.9" transform="matrix(-0.944 -0.3299 0.3299 -0.944 237.5038 181.0255)" class="st5" width="46" height="2.9"/>
<rect x="192.8" y="97.5" transform="matrix(-0.944 -0.3299 0.3299 -0.944 386.8907 263.5779)" class="st5" width="46" height="2.9"/>
</g>
</g>
</g>

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Before After
Before After

View file

@ -1,54 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-173 349.9 264.9 95.1" style="enable-background:new -173 349.9 264.9 95.1;" xml:space="preserve">
viewBox="-9 23.6 264.9 95.1" style="enable-background:new -9 23.6 264.9 95.1;" xml:space="preserve">
<style type="text/css">
.st0{fill:#71B221;}
.st0{fill:#FFBB00;}
.st1{fill:#1B171B;}
.st2{fill:#B8B8B9;}
.st3{fill:none;}
.st4{enable-background:new ;}
.st5{fill:none;stroke:#71B221;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:8,8;}
.st5{fill:none;stroke:#FFBB00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:8,8;}
.st6{fill:none;stroke:#1B171B;stroke-miterlimit:10;}
</style>
<g>
<g>
<g>
<g>
<path class="st0" d="M63.1,374.8c-2.6,0-4.8,1.7-5.7,4H34v4h23.4c0.8,2.3,3,4,5.7,4c3.3,0,6-2.7,6-6
C69.1,377.5,66.4,374.8,63.1,374.8z"/>
<path class="st1" d="M19.2,367.8c-7.2,0-13.3,4.6-15.6,11h-21.9c-0.8-2.3-3-4-5.7-4c-3.3,0-6,2.7-6,6s2.7,6,6,6
c2.6,0,4.8-1.7,5.7-4h21h31.8h1.2C35,374.3,27.9,367.8,19.2,367.8z"/>
<path class="st0" d="M226.8,48.2c-2.6,0-4.8,1.7-5.7,4h-23.4v4h23.4c0.8,2.3,3,4,5.7,4c3.3,0,6-2.7,6-6
C232.8,50.9,230.1,48.2,226.8,48.2z"/>
<path class="st1" d="M182.9,41.2c-7.2,0-13.3,4.6-15.6,11h-21.9c-0.8-2.3-3-4-5.7-4c-3.3,0-6,2.7-6,6s2.7,6,6,6
c2.6,0,4.8-1.7,5.7-4h21h31.8h1.2C198.7,47.7,191.6,41.2,182.9,41.2z"/>
</g>
<rect x="-47.3" y="371.3" class="st2" width="46" height="2.9"/>
<rect x="39.2" y="371.3" class="st2" width="46" height="2.9"/>
<rect x="116.4" y="44.7" class="st2" width="46" height="2.9"/>
<rect x="202.9" y="44.7" class="st2" width="46" height="2.9"/>
</g>
<rect x="26.7" y="401.5" class="st3" width="67.5" height="13.5"/>
<rect x="190.4" y="74.9" class="st3" width="67.5" height="13.5"/>
<g class="st4">
<path d="M28.1,412.1v-10h1.2v8.9h4.4v1.1H28.1z"/>
<path d="M39.8,412.1l-0.2-1.1h-0.1c-0.4,0.5-0.7,0.8-1.1,1c-0.4,0.2-0.8,0.2-1.4,0.2c-0.7,0-1.3-0.2-1.7-0.6
c-0.4-0.4-0.6-0.9-0.6-1.6c0-1.5,1.2-2.3,3.6-2.4l1.3,0v-0.5c0-0.6-0.1-1-0.4-1.3c-0.3-0.3-0.7-0.4-1.2-0.4
c-0.6,0-1.3,0.2-2.1,0.6l-0.3-0.9c0.4-0.2,0.8-0.4,1.2-0.5c0.4-0.1,0.9-0.2,1.3-0.2c0.9,0,1.6,0.2,2,0.6s0.6,1,0.6,1.9v5.1H39.8z
M37.2,411.3c0.7,0,1.3-0.2,1.7-0.6s0.6-0.9,0.6-1.6v-0.7l-1.1,0c-0.9,0-1.6,0.2-2,0.4c-0.4,0.2-0.6,0.6-0.6,1.2
c0,0.4,0.1,0.7,0.4,0.9C36.5,411.2,36.8,411.3,37.2,411.3z"/>
<path d="M48.1,412.1v-4.8c0-0.6-0.1-1.1-0.4-1.4c-0.3-0.3-0.7-0.5-1.3-0.5c-0.8,0-1.4,0.2-1.7,0.6c-0.4,0.4-0.5,1.1-0.5,2.1v3.9
H43v-7.5h0.9l0.2,1h0.1c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.4-0.3c0.9,0,1.6,0.2,2,0.7c0.5,0.4,0.7,1.1,0.7,2.1v4.9H48.1z"
/>
<path d="M56.7,411.1L56.7,411.1c-0.6,0.8-1.4,1.1-2.4,1.1c-1,0-1.7-0.3-2.3-1c-0.5-0.7-0.8-1.6-0.8-2.9s0.3-2.2,0.8-2.9
s1.3-1,2.3-1c1,0,1.8,0.4,2.3,1.1h0.1l0-0.5l0-0.5v-3h1.1v10.6h-0.9L56.7,411.1z M54.4,411.3c0.8,0,1.3-0.2,1.7-0.6
c0.3-0.4,0.5-1.1,0.5-2v-0.2c0-1.1-0.2-1.8-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7c-0.7,0-1.2,0.3-1.5,0.8c-0.4,0.5-0.5,1.2-0.5,2.2
c0,1,0.2,1.7,0.5,2.2C53.2,411.1,53.7,411.3,54.4,411.3z"/>
<path d="M191.8,85.5v-10h1.2v8.9h4.4v1.1H191.8z"/>
<path d="M203.5,85.5l-0.2-1.1h-0.1c-0.4,0.5-0.7,0.8-1.1,1c-0.4,0.2-0.8,0.2-1.4,0.2c-0.7,0-1.3-0.2-1.7-0.6
c-0.4-0.4-0.6-0.9-0.6-1.6c0-1.5,1.2-2.3,3.6-2.4h1.3v-0.5c0-0.6-0.1-1-0.4-1.3s-0.7-0.4-1.2-0.4c-0.6,0-1.3,0.2-2.1,0.6
l-0.3-0.9c0.4-0.2,0.8-0.4,1.2-0.5c0.4-0.1,0.9-0.2,1.3-0.2c0.9,0,1.6,0.2,2,0.6c0.4,0.4,0.6,1,0.6,1.9v5.1L203.5,85.5
L203.5,85.5z M200.9,84.7c0.7,0,1.3-0.2,1.7-0.6c0.4-0.4,0.6-0.9,0.6-1.6v-0.7h-1.1c-0.9,0-1.6,0.2-2,0.4
c-0.4,0.2-0.6,0.6-0.6,1.2c0,0.4,0.1,0.7,0.4,0.9C200.2,84.6,200.5,84.7,200.9,84.7z"/>
<path d="M211.8,85.5v-4.8c0-0.6-0.1-1.1-0.4-1.4s-0.7-0.5-1.3-0.5c-0.8,0-1.4,0.2-1.7,0.6c-0.4,0.4-0.5,1.1-0.5,2.1v3.9h-1.2
v-7.5h0.9l0.2,1h0.1c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.4-0.3c0.9,0,1.6,0.2,2,0.7c0.5,0.4,0.7,1.1,0.7,2.1v4.9L211.8,85.5
L211.8,85.5z"/>
<path d="M220.4,84.5L220.4,84.5c-0.6,0.8-1.4,1.1-2.4,1.1s-1.7-0.3-2.3-1c-0.5-0.7-0.8-1.6-0.8-2.9s0.3-2.2,0.8-2.9s1.3-1,2.3-1
s1.8,0.4,2.3,1.1h0.1v-0.5v-0.5v-3h1.1v10.6h-0.9L220.4,84.5z M218.1,84.7c0.8,0,1.3-0.2,1.7-0.6c0.3-0.4,0.5-1.1,0.5-2v-0.2
c0-1.1-0.2-1.8-0.5-2.3c-0.4-0.5-0.9-0.7-1.7-0.7c-0.7,0-1.2,0.3-1.5,0.8c-0.4,0.5-0.5,1.2-0.5,2.2s0.2,1.7,0.5,2.2
C216.9,84.5,217.4,84.7,218.1,84.7z"/>
</g>
<g>
<path class="st0" d="M23.1,432.6L23.1,432.6c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3l-3-3.3
l0,0c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0l3.7,4.1c0.2,0.2,0.5,0.3,0.8,0.3s0.6-0.1,0.8-0.3
L23.1,432.6z"/>
<line class="st5" x1="18.6" y1="392" x2="18.6" y2="430"/>
<path class="st0" d="M186.8,106L186.8,106c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3l-3-3.3
l0,0c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0l3.7,4.1c0.2,0.2,0.5,0.3,0.8,0.3
c0.3,0,0.6-0.1,0.8-0.3L186.8,106z"/>
<line class="st5" x1="182.3" y1="65.4" x2="182.3" y2="103.4"/>
</g>
<line class="st6" x1="-167.8" y1="441.3" x2="87.2" y2="441.3"/>
<line class="st6" x1="-4.1" y1="114.7" x2="250.9" y2="114.7"/>
</g>
<path class="st0" d="M-157.2,420.1c-4.7,0-8.5,3.8-8.5,8.5c0,4.7,5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6
C-148.7,423.9-152.5,420.1-157.2,420.1z M-153.9,431.7h-1.9v-2.2h-2.9v2.2h-1.9v-6.2h1.9v2.2h2.9v-2.2h1.9V431.7z"/>
<path class="st0" d="M6.5,93.5C1.8,93.5-2,97.3-2,102s5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6C15,97.3,11.2,93.5,6.5,93.5z
M9.8,105.1H7.9v-2.2H5v2.2H3.1v-6.2H5v2.2h2.9v-2.2h1.9V105.1z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

View file

@ -1,56 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-173 349.9 264.9 95.1" style="enable-background:new -173 349.9 264.9 95.1;" xml:space="preserve">
viewBox="-9 23.6 264.9 95.1" style="enable-background:new -9 23.6 264.9 95.1;" xml:space="preserve">
<style type="text/css">
.st0{fill:#71B221;}
.st0{fill:#FFBB00;}
.st1{fill:#1B171B;}
.st2{fill:#B8B8B9;}
.st3{fill:none;}
.st4{enable-background:new ;}
.st5{fill:none;stroke:#71B221;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
.st5{fill:none;stroke:#FFBB00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
.st6{fill:none;stroke:#1B171B;stroke-miterlimit:10;}
</style>
<g>
<g>
<g>
<g>
<path class="st0" d="M63.1,374.7c-2.6,0-4.8,1.7-5.7,4H34v4h23.4c0.8,2.3,3,4,5.7,4c3.3,0,6-2.7,6-6
C69.1,377.4,66.4,374.7,63.1,374.7z"/>
<path class="st1" d="M19.2,367.7c-7.2,0-13.3,4.6-15.6,11h-21.9c-0.8-2.3-3-4-5.7-4c-3.3,0-6,2.7-6,6c0,3.3,2.7,6,6,6
c2.6,0,4.8-1.7,5.7-4h21h31.8h1.2C35,374.3,27.9,367.7,19.2,367.7z"/>
<path class="st0" d="M226.8,47.3c-2.6,0-4.8,1.7-5.7,4h-23.4v4h23.4c0.8,2.3,3,4,5.7,4c3.3,0,6-2.7,6-6
C232.8,50,230.1,47.3,226.8,47.3z"/>
<path class="st1" d="M182.9,40.3c-7.2,0-13.3,4.6-15.6,11h-21.9c-0.8-2.3-3-4-5.7-4c-3.3,0-6,2.7-6,6s2.7,6,6,6
c2.6,0,4.8-1.7,5.7-4h21h31.8h1.2C198.7,46.9,191.6,40.3,182.9,40.3z"/>
</g>
<rect x="-47.3" y="371.2" class="st2" width="46" height="2.9"/>
<rect x="39.2" y="371.2" class="st2" width="46" height="2.9"/>
<rect x="116.4" y="43.8" class="st2" width="46" height="2.9"/>
<rect x="202.9" y="43.8" class="st2" width="46" height="2.9"/>
</g>
<rect x="26.7" y="401.5" class="st3" width="67.5" height="13.5"/>
<rect x="190.4" y="74.1" class="st3" width="67.5" height="13.5"/>
<g class="st4">
<path d="M35.7,412.1h-1.2v-4.7h-5.3v4.7h-1.2v-10h1.2v4.3h5.3v-4.3h1.2V412.1z"/>
<path d="M44.7,408.3c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4
c-0.3-0.6-0.4-1.3-0.4-2.1c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1c1,0,1.9,0.3,2.5,1C44.4,406.2,44.7,407.2,44.7,408.3z
M39,408.3c0,1,0.2,1.7,0.6,2.2c0.4,0.5,0.9,0.8,1.7,0.8c0.7,0,1.3-0.2,1.7-0.8c0.4-0.5,0.6-1.2,0.6-2.2c0-1-0.2-1.7-0.6-2.2
c-0.4-0.5-1-0.7-1.7-0.7c-0.7,0-1.3,0.2-1.7,0.7C39.2,406.7,39,407.4,39,408.3z"/>
<path d="M48.4,412.1l-2.8-7.5h1.2l1.6,4.4c0.4,1,0.6,1.7,0.6,2H49c0.1-0.2,0.2-0.7,0.5-1.5c0.3-0.8,0.9-2.4,1.8-5h1.2l-2.8,7.5
H48.4z"/>
<path d="M56.9,412.2c-1.1,0-2-0.3-2.6-1c-0.6-0.7-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9s1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9
c0.5,0.6,0.8,1.4,0.8,2.4v0.7h-5.2c0,0.9,0.2,1.5,0.7,2c0.4,0.5,1,0.7,1.8,0.7c0.8,0,1.6-0.2,2.4-0.5v1c-0.4,0.2-0.8,0.3-1.1,0.4
C57.8,412.2,57.4,412.2,56.9,412.2z M56.6,405.4c-0.6,0-1.1,0.2-1.4,0.6c-0.4,0.4-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6
C57.6,405.6,57.2,405.4,56.6,405.4z"/>
<path d="M65,404.5c0.3,0,0.6,0,0.9,0.1l-0.2,1.1c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1v-7.5
h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1C64.1,404.6,64.5,404.5,65,404.5z"/>
<path d="M199.4,84.7h-1.2V80h-5.3v4.7h-1.2v-10h1.2V79h5.3v-4.3h1.2V84.7z"/>
<path d="M208.4,80.9c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4
c-0.3-0.6-0.4-1.3-0.4-2.1c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1C208.1,78.8,208.4,79.8,208.4,80.9z
M202.7,80.9c0,1,0.2,1.7,0.6,2.2c0.4,0.5,0.9,0.8,1.7,0.8c0.7,0,1.3-0.2,1.7-0.8c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2
c-0.4-0.5-1-0.7-1.7-0.7c-0.7,0-1.3,0.2-1.7,0.7C202.9,79.3,202.7,80,202.7,80.9z"/>
<path d="M212.1,84.7l-2.8-7.5h1.2l1.6,4.4c0.4,1,0.6,1.7,0.6,2l0,0c0.1-0.2,0.2-0.7,0.5-1.5s0.9-2.4,1.8-5h1.2l-2.8,7.5h-1.3
V84.7z"/>
<path d="M220.6,84.8c-1.1,0-2-0.3-2.6-1s-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9
s0.8,1.4,0.8,2.4V81h-5.2c0,0.9,0.2,1.5,0.7,2c0.4,0.5,1,0.7,1.8,0.7c0.8,0,1.6-0.2,2.4-0.5v1c-0.4,0.2-0.8,0.3-1.1,0.4
C221.5,84.8,221.1,84.8,220.6,84.8z M220.3,78c-0.6,0-1.1,0.2-1.4,0.6c-0.4,0.4-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6
C221.3,78.2,220.9,78,220.3,78z"/>
<path d="M228.7,77.1c0.3,0,0.6,0,0.9,0.1l-0.2,1.1c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1
v-7.5h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1C227.8,77.2,228.2,77.1,228.7,77.1z"/>
</g>
<g>
<path class="st0" d="M23.1,432.5L23.1,432.5c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3l-3-3.3
l0,0c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0l3.7,4.1c0.2,0.2,0.5,0.3,0.8,0.3s0.6-0.1,0.8-0.3
L23.1,432.5z"/>
<path class="st0" d="M14.2,389.2L14.2,389.2c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.6,0.5,1,1,1c0.3,0,0.6-0.1,0.7-0.3l0,0l3-3.3l3,3.3
<path class="st0" d="M186.8,105.1L186.8,105.1c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3
l-3-3.3l0,0c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0l3.7,4.1c0.2,0.2,0.5,0.3,0.8,0.3
c0.3,0,0.6-0.1,0.8-0.3L186.8,105.1z"/>
<path class="st0" d="M177.9,61.8L177.9,61.8c-0.2,0.2-0.3,0.4-0.3,0.7c0,0.6,0.5,1,1,1c0.3,0,0.6-0.1,0.7-0.3l0,0l3-3.3l3,3.3
l0,0c0.2,0.2,0.5,0.3,0.7,0.3c0.6,0,1-0.5,1-1c0-0.3-0.1-0.5-0.3-0.7l0,0l-3.7-4.1c-0.2-0.2-0.5-0.3-0.8-0.3s-0.6,0.1-0.8,0.3
L14.2,389.2z"/>
<line class="st5" x1="18.6" y1="392" x2="18.6" y2="430"/>
L177.9,61.8z"/>
<line class="st5" x1="182.3" y1="64.6" x2="182.3" y2="102.6"/>
</g>
<line class="st6" x1="-167.8" y1="441.2" x2="87.2" y2="441.2"/>
<line class="st6" x1="-4.1" y1="113.8" x2="250.9" y2="113.8"/>
</g>
<path class="st0" d="M-157.2,419.8c-4.7,0-8.5,3.8-8.5,8.5c0,4.7,5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6
C-148.7,423.6-152.5,419.8-157.2,419.8z M-153.9,431.5h-1.9v-2.2h-2.9v2.2h-1.9v-6.2h1.9v2.2h2.9v-2.2h1.9V431.5z"/>
<path class="st0" d="M6.5,92.4c-4.7,0-8.5,3.8-8.5,8.5s5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6C15,96.2,11.2,92.4,6.5,92.4z
M9.8,104.1H7.9v-2.2H5v2.2H3.1v-6.2H5v2.2h2.9v-2.2h1.9V104.1z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Before After
Before After

View file

@ -1,82 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-173 349.9 264.9 95.1" style="enable-background:new -173 349.9 264.9 95.1;" xml:space="preserve">
viewBox="-9 23.6 264.9 95.1" style="enable-background:new -9 23.6 264.9 95.1;" xml:space="preserve">
<style type="text/css">
.st0{fill:#71B221;}
.st0{fill:#FFBB00;}
.st1{fill:#1B171B;}
.st2{fill:#B8B8B9;}
.st3{fill:none;}
.st4{enable-background:new ;}
.st5{fill:none;stroke:#71B221;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
.st6{fill:none;stroke:#71B221;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:7.4103,7.4103;}
.st7{fill:none;stroke:#71B221;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:7.7778,7.7778;}
.st5{fill:none;stroke:#FFBB00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;}
.st6{fill:none;stroke:#FFBB00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:7.4103,7.4103;}
.st7{fill:none;stroke:#FFBB00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:7.7778,7.7778;}
.st8{fill:none;stroke:#1B171B;stroke-miterlimit:10;}
</style>
<g>
<path class="st0" d="M-152.8,414.3L-152.8,414.3c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3
l-3-3.3l0,0c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0l3.7,4.1c0.2,0.2,0.5,0.3,0.8,0.3
s0.6-0.1,0.8-0.3L-152.8,414.3z"/>
<path class="st0" d="M11.2,84.9L11.2,84.9c0.2-0.2,0.3-0.4,0.3-0.7c0-0.6-0.5-1-1-1c-0.3,0-0.6,0.1-0.7,0.3l0,0l-3,3.3l-3-3.3l0,0
c-0.2-0.2-0.5-0.3-0.7-0.3c-0.6,0-1,0.5-1,1c0,0.3,0.1,0.5,0.3,0.7l0,0L6.1,89c0.2,0.2,0.5,0.3,0.8,0.3s0.6-0.1,0.8-0.3L11.2,84.9z
"/>
<g>
<g>
<path class="st0" d="M-25.1,375.5c2.6,0,4.8,1.7,5.7,4H4v4h-23.4c-0.8,2.3-3,4-5.7,4c-3.3,0-6-2.7-6-6
C-31.1,378.2-28.4,375.5-25.1,375.5z"/>
<path class="st1" d="M18.7,368.5c7.2,0,13.3,4.6,15.6,11h21.9c0.8-2.3,3-4,5.7-4c3.3,0,6,2.7,6,6s-2.7,6-6,6
c-2.6,0-4.8-1.7-5.7-4h-21H3.4H2.2C3,375.1,10.1,368.5,18.7,368.5z"/>
<path class="st0" d="M138.9,46.1c2.6,0,4.8,1.7,5.7,4H168v4h-23.4c-0.8,2.3-3,4-5.7,4c-3.3,0-6-2.7-6-6S135.6,46.1,138.9,46.1z"
/>
<path class="st1" d="M182.7,39.1c7.2,0,13.3,4.6,15.6,11h21.9c0.8-2.3,3-4,5.7-4c3.3,0,6,2.7,6,6s-2.7,6-6,6
c-2.6,0-4.8-1.7-5.7-4h-21h-31.8h-1.2C167,45.7,174.1,39.1,182.7,39.1z"/>
</g>
<rect x="39.2" y="372" class="st2" width="46" height="2.9"/>
<rect x="-47.3" y="372" class="st2" width="46" height="2.9"/>
<rect x="203.2" y="42.6" class="st2" width="46" height="2.9"/>
<rect x="116.7" y="42.6" class="st2" width="46" height="2.9"/>
</g>
<rect x="-131" y="396.2" class="st3" width="86.5" height="32.1"/>
<rect x="33" y="66.8" class="st3" width="86.5" height="32.1"/>
<g class="st4">
<path d="M-128.5,402.7v4.2h-1.2v-10h2.7c1.2,0,2.1,0.2,2.7,0.7s0.9,1.2,0.9,2.1c0,1.3-0.7,2.2-2,2.7l2.7,4.5h-1.4l-2.4-4.2
L-128.5,402.7L-128.5,402.7z M-128.5,401.7h1.6c0.8,0,1.4-0.2,1.8-0.5s0.6-0.8,0.6-1.5s-0.2-1.1-0.6-1.4s-1-0.4-1.9-0.4h-1.5
V401.7z"/>
<path d="M-118,407c-1.1,0-2-0.3-2.6-1s-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9s1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9s0.8,1.4,0.8,2.4
v0.7h-5.2c0,0.9,0.2,1.5,0.7,2s1,0.7,1.8,0.7s1.6-0.2,2.4-0.5v1c-0.4,0.2-0.8,0.3-1.1,0.4C-117.1,407-117.5,407-118,407z
M-118.3,400.2c-0.6,0-1.1,0.2-1.4,0.6s-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6C-117.3,400.4-117.7,400.2-118.3,400.2z"/>
<path d="M-110.9,406.1c0.2,0,0.4,0,0.6,0s0.3-0.1,0.4-0.1v0.9c-0.1,0.1-0.3,0.1-0.5,0.1s-0.5,0.1-0.6,0.1c-1.4,0-2.2-0.8-2.2-2.3
v-4.5h-1.1v-0.5l1.1-0.5l0.5-1.6h0.7v1.7h2.2v0.9h-2.2v4.4c0,0.5,0.1,0.8,0.3,1S-111.3,406.1-110.9,406.1z"/>
<path d="M-107.3,399.4v4.9c0,0.6,0.1,1.1,0.4,1.4s0.7,0.5,1.3,0.5c0.8,0,1.4-0.2,1.7-0.6s0.5-1.1,0.5-2.1v-3.9h1.1v7.5h-0.9
l-0.2-1h-0.1c-0.2,0.4-0.6,0.7-1,0.8s-0.9,0.3-1.4,0.3c-0.9,0-1.6-0.2-2-0.6s-0.7-1.1-0.7-2.1v-4.9h1.3V399.4z"/>
<path d="M-96.4,399.2c0.3,0,0.6,0,0.9,0.1l-0.2,1.1c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1
v-7.5h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1S-96.8,399.2-96.4,399.2z"/>
<path d="M-88.9,406.9v-4.8c0-0.6-0.1-1.1-0.4-1.4s-0.7-0.5-1.3-0.5c-0.8,0-1.4,0.2-1.7,0.6s-0.5,1.1-0.5,2.1v3.9h-1.1v-7.5h0.9
l0.2,1h0.1c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.4-0.3c0.9,0,1.6,0.2,2,0.7c0.5,0.4,0.7,1.1,0.7,2.1v4.9L-88.9,406.9
L-88.9,406.9z"/>
<path d="M-79.4,406.1c0.2,0,0.4,0,0.6,0s0.3-0.1,0.4-0.1v0.9c-0.1,0.1-0.3,0.1-0.5,0.1s-0.5,0.1-0.6,0.1c-1.4,0-2.2-0.8-2.2-2.3
v-4.5h-1.1v-0.5l1.1-0.5l0.5-1.6h0.7v1.7h2.2v0.9h-2.2v4.4c0,0.5,0.1,0.8,0.3,1S-79.8,406.1-79.4,406.1z"/>
<path d="M-70.4,403.1c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4s-0.4-1.3-0.4-2.1
c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1S-70.4,401.9-70.4,403.1z M-76.1,403.1c0,1,0.2,1.7,0.6,2.2
s0.9,0.8,1.7,0.8s1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2s-1-0.7-1.7-0.7s-1.3,0.2-1.7,0.7
S-76.1,402.1-76.1,403.1z"/>
<path d="M35.5,73.3v4.2h-1.2v-10H37c1.2,0,2.1,0.2,2.7,0.7s0.9,1.2,0.9,2.1c0,1.3-0.7,2.2-2,2.7l2.7,4.5h-1.4l-2.4-4.2L35.5,73.3
L35.5,73.3z M35.5,72.3h1.6c0.8,0,1.4-0.2,1.8-0.5s0.6-0.8,0.6-1.5s-0.2-1.1-0.6-1.4s-1-0.4-1.9-0.4h-1.5V72.3z"/>
<path d="M46,77.6c-1.1,0-2-0.3-2.6-1s-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9s1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9s0.8,1.4,0.8,2.4
v0.7h-5.2c0,0.9,0.2,1.5,0.7,2s1,0.7,1.8,0.7s1.6-0.2,2.4-0.5v1c-0.4,0.2-0.8,0.3-1.1,0.4C46.9,77.6,46.5,77.6,46,77.6z
M45.7,70.8c-0.6,0-1.1,0.2-1.4,0.6s-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6C46.7,71,46.3,70.8,45.7,70.8z"/>
<path d="M53.1,76.7c0.2,0,0.4,0,0.6,0s0.3-0.1,0.4-0.1v0.9c-0.1,0.1-0.3,0.1-0.5,0.1s-0.5,0.1-0.6,0.1c-1.4,0-2.2-0.8-2.2-2.3
v-4.5h-1.1v-0.5l1.1-0.5l0.5-1.6H52V70h2.2v0.9H52v4.4c0,0.5,0.1,0.8,0.3,1S52.7,76.7,53.1,76.7z"/>
<path d="M56.7,70v4.9c0,0.6,0.1,1.1,0.4,1.4s0.7,0.5,1.3,0.5c0.8,0,1.4-0.2,1.7-0.6s0.5-1.1,0.5-2.1v-3.9h1.1v7.5h-0.9l-0.2-1
h-0.1c-0.2,0.4-0.6,0.7-1,0.8s-0.9,0.3-1.4,0.3c-0.9,0-1.6-0.2-2-0.6s-0.7-1.1-0.7-2.1v-4.9h1.3C56.7,70.2,56.7,70,56.7,70z"/>
<path d="M67.6,69.8c0.3,0,0.6,0,0.9,0.1L68.3,71c-0.3-0.1-0.6-0.1-0.8-0.1c-0.6,0-1.1,0.2-1.6,0.7s-0.6,1.1-0.6,1.8v4h-1.1v-7.5
h0.9l0.1,1.4h0.1c0.3-0.5,0.6-0.9,1-1.1S67.2,69.8,67.6,69.8z"/>
<path d="M75.1,77.5v-4.8c0-0.6-0.1-1.1-0.4-1.4s-0.7-0.5-1.3-0.5c-0.8,0-1.4,0.2-1.7,0.6s-0.5,1.1-0.5,2.1v3.9h-1.1v-7.5H71l0.2,1
h0.1c0.2-0.4,0.6-0.7,1-0.9c0.4-0.2,0.9-0.3,1.4-0.3c0.9,0,1.6,0.2,2,0.7c0.5,0.4,0.7,1.1,0.7,2.1v4.9L75.1,77.5L75.1,77.5z"/>
<path d="M84.6,76.7c0.2,0,0.4,0,0.6,0s0.3-0.1,0.4-0.1v0.9c-0.1,0.1-0.3,0.1-0.5,0.1s-0.5,0.1-0.6,0.1c-1.4,0-2.2-0.8-2.2-2.3
v-4.5h-1.1v-0.5l1.1-0.5l0.5-1.6h0.7V70h2.2v0.9h-2.2v4.4c0,0.5,0.1,0.8,0.3,1S84.2,76.7,84.6,76.7z"/>
<path d="M93.6,73.7c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4s-0.4-1.3-0.4-2.1
c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1S93.6,72.5,93.6,73.7z M87.9,73.7c0,1,0.2,1.7,0.6,2.2s0.9,0.8,1.7,0.8
s1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2s-1-0.7-1.7-0.7s-1.3,0.2-1.7,0.7S87.9,72.7,87.9,73.7z"/>
</g>
<g class="st4">
<path d="M-122.1,423.7h-1.2V419h-5.3v4.7h-1.2v-10h1.2v4.3h5.3v-4.3h1.2C-122.1,413.7-122.1,423.7-122.1,423.7z"/>
<path d="M-113,419.9c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4s-0.4-1.3-0.4-2.1
c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1S-113,418.7-113,419.9z M-118.7,419.9c0,1,0.2,1.7,0.6,2.2
s0.9,0.8,1.7,0.8s1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2s-1-0.7-1.7-0.7s-1.3,0.2-1.7,0.7
S-118.7,418.9-118.7,419.9z"/>
<path d="M-101.5,423.7v-4.9c0-0.6-0.1-1-0.4-1.3s-0.7-0.4-1.2-0.4c-0.7,0-1.2,0.2-1.6,0.6s-0.5,1-0.5,1.9v4.2h-1.1v-4.9
<path d="M41.9,94.3h-1.2v-4.7h-5.3v4.7h-1.2v-10h1.2v4.3h5.3v-4.3h1.2C41.9,84.3,41.9,94.3,41.9,94.3z"/>
<path d="M51,90.5c0,1.2-0.3,2.2-0.9,2.9c-0.6,0.7-1.5,1-2.5,1c-0.7,0-1.3-0.2-1.8-0.5s-0.9-0.8-1.2-1.4s-0.4-1.3-0.4-2.1
c0-1.2,0.3-2.2,0.9-2.9c0.6-0.7,1.5-1,2.5-1s1.9,0.3,2.5,1S51,89.3,51,90.5z M45.3,90.5c0,1,0.2,1.7,0.6,2.2s0.9,0.8,1.7,0.8
s1.3-0.2,1.7-0.7c0.4-0.5,0.6-1.2,0.6-2.2s-0.2-1.7-0.6-2.2s-1-0.7-1.7-0.7s-1.3,0.2-1.7,0.7S45.3,89.5,45.3,90.5z"/>
<path d="M62.5,94.3v-4.9c0-0.6-0.1-1-0.4-1.3s-0.7-0.4-1.2-0.4c-0.7,0-1.2,0.2-1.6,0.6s-0.5,1-0.5,1.9v4.2h-1.1v-4.9
c0-0.6-0.1-1-0.4-1.3s-0.7-0.4-1.2-0.4c-0.7,0-1.2,0.2-1.6,0.6c-0.3,0.4-0.5,1.1-0.5,2.1v3.9h-1.1v-7.5h0.9l0.2,1h0.1
c0.2-0.4,0.5-0.6,0.9-0.9s0.8-0.3,1.3-0.3c1.2,0,1.9,0.4,2.3,1.3h0.1c0.2-0.4,0.5-0.7,1-0.9s0.9-0.3,1.4-0.3
c0.8,0,1.5,0.2,1.9,0.7c0.4,0.4,0.6,1.1,0.6,2.1v4.9h-1.1V423.7z"/>
<path d="M-94.8,423.8c-1.1,0-2-0.3-2.6-1s-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9s1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9
c0.8,0,1.5,0.2,1.9,0.7c0.4,0.4,0.6,1.1,0.6,2.1v4.9h-1.1L62.5,94.3L62.5,94.3z"/>
<path d="M69.2,94.4c-1.1,0-2-0.3-2.6-1s-1-1.6-1-2.8c0-1.2,0.3-2.2,0.9-2.9s1.4-1.1,2.4-1.1c0.9,0,1.7,0.3,2.2,0.9
s0.8,1.4,0.8,2.4v0.7h-5.2c0,0.9,0.2,1.5,0.7,2s1,0.7,1.8,0.7s1.6-0.2,2.4-0.5v1c-0.4,0.2-0.8,0.3-1.1,0.4
C-93.9,423.8-94.3,423.8-94.8,423.8z M-95.1,417c-0.6,0-1.1,0.2-1.4,0.6s-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6
C-94.1,417.2-94.6,417-95.1,417z"/>
C70.1,94.4,69.7,94.4,69.2,94.4z M68.9,87.6c-0.6,0-1.1,0.2-1.4,0.6s-0.6,0.9-0.6,1.6h3.9c0-0.7-0.2-1.3-0.5-1.6
C69.9,87.8,69.4,87.6,68.9,87.6z"/>
</g>
<g>
<g>
<line class="st5" x1="-52.9" y1="379.2" x2="-56.9" y2="379.2"/>
<line class="st6" x1="-64.3" y1="379.2" x2="-149.6" y2="379.2"/>
<polyline class="st5" points="-153.3,379.2 -157.3,379.2 -157.3,383.2 "/>
<line class="st7" x1="-157.3" y1="391" x2="-157.3" y2="402.6"/>
<line class="st5" x1="-157.3" y1="406.5" x2="-157.3" y2="410.5"/>
<line class="st5" x1="111.1" y1="49.8" x2="107.1" y2="49.8"/>
<line class="st6" x1="99.7" y1="49.8" x2="14.4" y2="49.8"/>
<polyline class="st5" points="10.7,49.8 6.7,49.8 6.7,53.8 "/>
<line class="st7" x1="6.7" y1="61.6" x2="6.7" y2="73.2"/>
<line class="st5" x1="6.7" y1="77.1" x2="6.7" y2="81.1"/>
</g>
</g>
<line class="st8" x1="-167.8" y1="442" x2="87.2" y2="442"/>
<path class="st0" d="M-157.2,420.6c-4.7,0-8.5,3.8-8.5,8.5s5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6
C-148.7,424.4-152.5,420.6-157.2,420.6z M-153.9,432.2h-1.9V430h-2.9v2.2h-1.9V426h1.9v2.2h2.9V426h1.9V432.2z"/>
<line class="st8" x1="-3.8" y1="112.6" x2="251.2" y2="112.6"/>
<path class="st0" d="M6.8,91.2c-4.7,0-8.5,3.8-8.5,8.5s5.2,8.6,8.5,11.6c2.7-2.7,8.5-7,8.5-11.6C15.3,95,11.5,91.2,6.8,91.2z
M10.1,102.8H8.2v-2.2H5.3v2.2H3.4v-6.2h1.9v2.2h2.9v-2.2h1.9V102.8z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Before After
Before After

View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="28 -43 141.7 141.7" style="enable-background:new 28 -43 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFCC00;}
</style>
<g>
<g>
<path class="st0" d="M157.1,71.9l-52-97.5c-1.3-2.4-3.8-4-6.6-4c-2.8,0-5.3,1.5-6.6,4L39.6,71.9c-1.2,2.3-1.2,5.1,0.2,7.4
c1.4,2.3,3.8,3.7,6.5,3.7h104.3c2.6,0,5.1-1.4,6.4-3.7C158.3,77,158.4,74.2,157.1,71.9L157.1,71.9z M98.5,67.9
c-4.1,0-7.5-3.3-7.5-7.5c0-4.1,3.4-7.5,7.5-7.5c4.1,0,7.5,3.4,7.5,7.5C106,64.6,102.6,67.9,98.5,67.9L98.5,67.9z M106,38
c0,4.2-3.4,7.5-7.5,7.5c-4.1,0-7.5-3.3-7.5-7.5V8c0-4.1,3.4-7.5,7.5-7.5c4.1,0,7.5,3.4,7.5,7.5V38z M106,38"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 920 B

View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="28 -43 141.7 141.7" style="enable-background:new 28 -43 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#818180;}
</style>
<g>
<g>
<path class="st0" d="M157.1,71.9l-52-97.5c-1.3-2.4-3.8-4-6.6-4c-2.8,0-5.3,1.5-6.6,4L39.6,71.9c-1.2,2.3-1.2,5.1,0.2,7.4
c1.4,2.3,3.8,3.7,6.5,3.7h104.3c2.6,0,5.1-1.4,6.4-3.7C158.3,77,158.4,74.2,157.1,71.9L157.1,71.9z M98.5,67.9
c-4.1,0-7.5-3.3-7.5-7.5c0-4.1,3.4-7.5,7.5-7.5c4.1,0,7.5,3.4,7.5,7.5C106,64.6,102.6,67.9,98.5,67.9L98.5,67.9z M106,38
c0,4.2-3.4,7.5-7.5,7.5c-4.1,0-7.5-3.3-7.5-7.5V8c0-4.1,3.4-7.5,7.5-7.5c4.1,0,7.5,3.4,7.5,7.5V38z M106,38"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 920 B

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 85 56.7" style="enable-background:new 0 0 85 56.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#838281;}
</style>
<g>
<path class="st0" d="M7,43.6c1,1,2.1,1.5,3.5,1.5h59.9c1.4,0,2.5-0.5,3.5-1.5c1-1,1.5-2.1,1.5-3.5v-6h2.3c1.3,0,2.3-1,2.3-2.3v-6.1
c0-1.3-1-2.3-2.3-2.3h-2.3v-5.8c0-1.4-0.5-2.5-1.5-3.5c-1-1-2.1-1.5-3.5-1.5l-59.9,0c-1.4,0-2.6,0.5-3.5,1.4c-1,1-1.4,2.2-1.4,3.5
v22.4C5.5,41.4,6,42.6,7,43.6L7,43.6z M9.1,16.7c0-0.3,0.1-0.4,0.4-0.4l61.9,0c0.2,0,0.4,0.2,0.4,0.4v24.4c0,0.2-0.2,0.4-0.4,0.4
l-61.9,0c-0.3,0-0.4-0.1-0.4-0.4V16.7z M9.1,16.7"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 870 B

View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="28 -43 141.7 141.7" style="enable-background:new 28 -43 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#E60000;}
</style>
<g>
<path class="st0" d="M98.9,87l60.9-61.9c0.8-0.8,1.2-1.9,1.1-3l0,0C156.7-8.4,130.5-32,98.9-32c-31.5,0-57.7,23.5-62,53.8v0.1V22
l0,0c-0.1,1,0.3,2.1,1.1,2.9l42.9,43.8 M107,68.2l14.8-49.6c3.3-4.7,8.7-7.8,14.9-7.8c7.2,0,13.4,4.2,16.4,10.3L107,68.2z M83.7,19
c3.2-4.9,8.8-8.2,15.2-8.2c6.2,0,11.7,3.1,15,7.9L99,68.7L83.7,19z M44.5,20.8c3-6,9.1-10.1,16.2-10.1c6.2,0,11.7,3.1,14.9,7.8
l15.1,49.4L44.5,20.8z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 854 B

View file

@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="141.7px" height="141.7px" viewBox="0 0 141.7 141.7" enable-background="new 0 0 141.7 141.7" xml:space="preserve">
viewBox="28 -43 141.7 141.7" style="enable-background:new 28 -43 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#818181;}
</style>
<g>
<path fill="#818181" d="M70.9,130l60.9-61.9c0.8-0.8,1.2-1.9,1.1-3h0c-4.2-30.5-30.4-54.1-62-54.1c-31.5,0-57.7,23.5-62,53.8
c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1h0c-0.1,1,0.3,2.1,1.1,2.9l42.9,43.8 M79,111.2l14.8-49.6c3.3-4.7,8.7-7.8,14.9-7.8
c7.2,0,13.4,4.2,16.4,10.3L79,111.2z M55.7,62c3.2-4.9,8.8-8.2,15.2-8.2c6.2,0,11.7,3.1,15,7.9l-14.9,50L55.7,62z M16.5,63.8
c3-6,9.1-10.1,16.2-10.1c6.2,0,11.7,3.1,14.9,7.8l15.1,49.4L16.5,63.8z"/>
<path class="st0" d="M98.9,87l60.9-61.9c0.8-0.8,1.2-1.9,1.1-3l0,0C156.7-8.4,130.5-32,98.9-32c-31.5,0-57.7,23.5-62,53.8v0.1V22
l0,0c-0.1,1,0.3,2.1,1.1,2.9l42.9,43.8 M107,68.2l14.8-49.6c3.3-4.7,8.7-7.8,14.9-7.8c7.2,0,13.4,4.2,16.4,10.3L107,68.2z M83.7,19
c3.2-4.9,8.8-8.2,15.2-8.2c6.2,0,11.7,3.1,15,7.9L99,68.7L83.7,19z M44.5,20.8c3-6,9.1-10.1,16.2-10.1c6.2,0,11.7,3.1,14.9,7.8
l15.1,49.4L44.5,20.8z"/>
</g>
</svg>
</svg>

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 854 B

Before After
Before After

View file

@ -1,27 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-433 235 92 92" style="enable-background:new -433 235 92 92;" xml:space="preserve">
<style type="text/css">
.st0{fill:#59AA29;}
</style>
<g>
<path class="st0" d="M-387.6,235c-25.4,0.3-45.7,21.2-45.4,46.6c0.3,25.4,21.2,45.7,46.6,45.4c25.4-0.3,45.7-21.2,45.4-46.6
C-341.3,255-362.2,234.7-387.6,235z M-387.8,309l-0.3,0c-3.9-0.1-6.7-3-6.6-6.9c0.1-3.8,2.9-6.5,6.7-6.5l0.2,0c4,0.1,6.7,3,6.6,6.9
C-381.1,306.3-383.9,309-387.8,309z M-371.3,276.3c-0.9,1.3-2.9,2.9-5.5,4.9l-2.8,1.9c-1.5,1.2-2.5,2.3-2.8,3.4
c-0.3,0.9-0.4,1.1-0.4,2.9l0,0.5h-10.7l0-0.9c0.1-3.7,0.2-5.9,1.8-7.7c2.4-2.8,7.8-6.3,8-6.4c0.8-0.6,1.4-1.2,1.9-1.9
c1.1-1.6,1.6-2.8,1.6-4c0-1.7-0.5-3.2-1.5-4.6c-0.9-1.3-2.7-2-5.3-2c-2.6,0-4.3,0.8-5.4,2.5c-1.1,1.7-1.6,3.5-1.6,5.4v0.5h-11.1
l0-0.5c0.3-6.8,2.7-11.6,7.2-14.5c2.8-1.8,6.3-2.7,10.4-2.7c5.3,0,9.9,1.3,13.4,3.9c3.6,2.6,5.4,6.5,5.4,11.6
C-368.6,271.3-369.5,273.9-371.3,276.3z"/>
</g>
<rect class="shadow" x="10" y="10" width="100" height="50" fill="#c66" />
</svg>
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-95 24.7 92 92" style="enable-background:new -95 24.7 92 92;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFBB00;}
</style>
<g>
<path class="st0" d="M-49.6,24.7C-75,25-95.3,45.9-95,71.3c0.3,25.4,21.2,45.7,46.6,45.4C-23,116.4-2.7,95.5-3,70.1
C-3.3,44.7-24.2,24.4-49.6,24.7z M-49.8,98.7h-0.3c-3.9-0.1-6.7-3-6.6-6.9c0.1-3.8,2.9-6.5,6.7-6.5h0.2c4,0.1,6.7,3,6.6,6.9
C-43.1,96-45.9,98.7-49.8,98.7z M-33.3,66c-0.9,1.3-2.9,2.9-5.5,4.9l-2.8,1.9c-1.5,1.2-2.5,2.3-2.8,3.4c-0.3,0.9-0.4,1.1-0.4,2.9
v0.5h-10.7v-0.9c0.1-3.7,0.2-5.9,1.8-7.7c2.4-2.8,7.8-6.3,8-6.4c0.8-0.6,1.4-1.2,1.9-1.9c1.1-1.6,1.6-2.8,1.6-4
c0-1.7-0.5-3.2-1.5-4.6c-0.9-1.3-2.7-2-5.3-2c-2.6,0-4.3,0.8-5.4,2.5S-56,58.1-56,60v0.5h-11.1V60c0.3-6.8,2.7-11.6,7.2-14.5
c2.8-1.8,6.3-2.7,10.4-2.7c5.3,0,9.9,1.3,13.4,3.9c3.6,2.6,5.4,6.5,5.4,11.6C-30.6,61-31.5,63.6-33.3,66z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-70 0 141.7 141.7" style="enable-background:new -70 0 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFBB00;}
</style>
<g>
<g>
<path class="st0" d="M49.1,65.3l-21,21c-11.6,11.6-30.4,11.6-42,0c-1.8-1.8-3.3-3.9-4.5-6l9.8-9.8c0.5-0.5,1-0.7,1.6-1.1
c0.7,2.3,1.9,4.5,3.7,6.3c5.8,5.8,15.2,5.8,21,0l21-21c5.8-5.8,5.8-15.2,0-21s-15.2-5.8-21,0l-7.5,7.5c-6.1-2.4-12.6-3-18.9-2.1
L7.2,23.2c11.6-11.6,30.4-11.6,42,0C60.7,35,60.7,53.8,49.1,65.3L49.1,65.3z M-6.4,99.8l-7.5,7.5c-5.8,5.8-15.2,5.8-21,0
s-5.8-15.2,0-21l21-21c5.8-5.8,15.2-5.8,21,0c1.8,1.8,3,4,3.7,6.3c0.6-0.3,1.1-0.6,1.6-1l9.8-9.7c-1.2-2.1-2.7-4.2-4.5-6
c-11.6-11.6-30.4-11.6-42,0l-21,21c-11.6,11.6-11.6,30.4,0,42c11.6,11.6,30.4,11.6,42,0L12.6,102C6.2,102.8-0.3,102.2-6.4,99.8
L-6.4,99.8z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="28 -43 141.7 141.7" style="enable-background:new 28 -43 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#818180;}
</style>
<g>
<g>
<path class="st0" d="M146.1,18.3l-21,21c-11.6,11.6-30.4,11.6-42,0c-1.8-1.8-3.3-3.9-4.5-6l9.8-9.8c0.5-0.5,1-0.7,1.6-1.1
c0.7,2.3,1.9,4.5,3.7,6.3c5.8,5.8,15.2,5.8,21,0l21-21c5.8-5.8,5.8-15.2,0-21s-15.2-5.8-21,0l-7.5,7.5c-6.1-2.4-12.6-3-18.9-2.1
l15.9-15.9c11.6-11.6,30.4-11.6,42,0C157.7-12,157.7,6.8,146.1,18.3L146.1,18.3z M90.6,52.8l-7.5,7.5c-5.8,5.8-15.2,5.8-21,0
s-5.8-15.2,0-21l21-21c5.8-5.8,15.2-5.8,21,0c1.8,1.8,3,4,3.7,6.3c0.6-0.3,1.1-0.6,1.6-1l9.8-9.7c-1.2-2.1-2.7-4.2-4.5-6
c-11.6-11.6-30.4-11.6-42,0l-21,21c-11.6,11.6-11.6,30.4,0,42s30.4,11.6,42,0L109.6,55C103.2,55.8,96.7,55.2,90.6,52.8L90.6,52.8z
"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

View file

@ -4,15 +4,9 @@
viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
<style type="text/css">
.st0{fill:#707173;}
.st1{fill:#9C9E9F;}
</style>
<g>
<path class="st0" d="M82.4,48.7V26.9C75.6,17.3,60,10.6,41.9,10.6C24.3,10.6,9.1,16.9,2,26.1v22.8c7.1-9.2,22.3-15.5,39.9-15.5
c17.8,0,33.1,6.5,40.1,15.8C82.2,49,82.3,48.8,82.4,48.7z"/>
<g>
<path class="st1" d="M61.7,64.8c9.2-2.9,16.6-7.6,20.7-13.4V29.7c-0.1-0.2-0.2-0.4-0.4-0.5c-4.2,5.6-11.4,10.1-20.3,12.9V64.8z"/>
<path class="st1" d="M36.8,67.4V44.6C21.4,43.5,8.4,37.6,2,29.3v22.9C8.4,60.4,21.4,66.4,36.8,67.4z"/>
</g>
<polygon class="st1" points="28.4,72.3 58.3,54.8 28.3,36.6 "/>
</g>
<path class="st0" d="M44.8,5.1C25,5.1,8.7,20.6,7.5,40.1h14.4c1.2-11.6,11-20.7,22.9-20.7c12.7,0,23.1,10.3,23.1,23.1
S57.5,65.5,44.8,65.5c-5,0-9.6-1.6-13.4-4.3v0l-11.3,9.2c6.6,5.8,15.2,9.4,24.7,9.4c20.6,0,37.4-16.8,37.4-37.4S65.4,5.1,44.8,5.1z"
/>
<polygon class="st0" points="1.7,31 12.8,58.2 30.9,35.1 "/>
</svg>

Before

Width:  |  Height:  |  Size: 948 B

After

Width:  |  Height:  |  Size: 726 B

Before After
Before After

View file

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.0" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.7 141.7" enable-background="new 0 0 141.7 141.7" xml:space="preserve">
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-70 0 141.7 141.7" style="enable-background:new -70 0 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#818181;}
</style>
<g>
<path fill="#818181" d="M65,82.3c-2.8,7.3-7.1,13.3-12.8,17.8c-8.1,6.4-16.7,9.6-25.9,9.6c-9.3,0-16.2-3-20.5-9.1
c-2.9-4-4.3-8.7-4.2-13.8c0.1-5.2,1.2-11.6,3.4-19.2c2.1-7.6,4.6-14,7.4-19.2c2.8-5.2,6.8-9.8,11.9-13.8c7.8-6.1,16.3-9.2,25.6-9.2
c9.4,0,16.3,3.1,20.6,9.4c3.2,4.5,4.1,10.4,2.9,17.6H58.2c0.6-3.1,0.1-6-1.3-8.6c-1.7-3.4-5.4-5-10.9-5c-5,0-9.6,1.8-14,5.4
c-2.3,1.8-4.3,4.3-6,7.3c-1.7,3.1-2.9,5.6-3.6,7.7c-0.7,2.1-1.5,4.9-2.5,8.4c-1,3.5-1.7,6.3-2.2,8.4c-0.5,2.1-0.7,4.6-0.7,7.7
c0,3.1,0.7,5.5,1.9,7.3c2.4,3.6,6,5.4,11,5.4c5.4,0,10-1.7,13.7-5.2c2.9-2.6,4.9-5.6,6.2-8.9H65z"/>
<path fill="#818181" d="M136.7,40.3H95.4l-6.1,21.8h36.9l-3.7,13.4H85.5l-9.1,32.7H61.6l22.7-81.2h56.1L136.7,40.3z"/>
<path class="st0" d="M8.4,34.1c0,0,16.2,7.3,21.5,13.4c0,0-5.9-0.2-8.1,3.3c-2.6,3.8-1.3,11.4,6.8,17.1s17.7,6.3,22.5,6.6
c4.8,0.2,9.6,1.3,10.6,3.5C61.4,78.1,62.9,51.6,8.4,34.1z M38.7,61.1c-1-4,2.2-5.5,6.6-3.8c4,1.8,10.6,12.1,10.6,12.1
C50.6,68.7,39.9,65.2,38.7,61.1z"/>
<path class="st0" d="M-68.6,10.4l9,19.7l-8.6-3l2.6,4.8c0,0,3.5,6.8,11.9,21.5c6.6,11.4,18.2,17.1,33.8,16.4c0.5,0,1.3,0,2,0
c9.6-0.5,31.6-3,32.6-3h0.2l10.3-4L-68.6,10.4z M-20.1,65.5c-5.5,0.2-10.6-0.5-14.9-2c-6.3-2.2-11.4-6.3-14.9-12.3
c-4.3-7.6-7.3-12.9-9-16.4l7.9,2.8L-59,20.8l74.2,40.9l-1.3,0.5c-0.5,0-1.8,0.2-3.8,0.5l-50-20.2L-2.2,64
C-9,64.4-16.4,65.2-20.1,65.5z"/>
<path class="st0" d="M24.8,59.4c0,0-31.6-8.3-26.8,16.4c3.1,16.2,21.3,6.8,27.9,0.7C32.4,70.5,27,60.2,24.8,59.4z"/>
<path class="st0" d="M41.5,96.8c-14.2-6.1-22.8-16-33.6-15.2C1.3,82.1-5.7,87.6-8.5,95c4,3.3,10.1,5.5,19.7,2c0,0-6.6,8.1-20.4,7.3
c0.2,1.8,1,3.3,1.8,5c1.3,2,3,4,5,5.5c5.9-0.7,13.9-3.5,21.7-12.1c0,0-0.7,9-7.9,17.1c3.8,0.5,7.9,0.5,12.1,0.2
c3.3-1.8,7.9-5,7.9-10.9c0,0,1.5,4.6-0.7,9.9c6.6-1.3,13.4-3.8,19.9-7.6C65.2,103,70,93.2,70,93.2S55.9,102.5,41.5,96.8z
M51.8,107.3c-0.7-2-1-6.1-1-6.1c4.6,0.5,10.1-1.5,10.1-1.5C57.2,104.6,51.8,107.3,51.8,107.3z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

View file

@ -1,13 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.0" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 141.7 141.7" enable-background="new 0 0 141.7 141.7" xml:space="preserve">
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-70 0 141.7 141.7" style="enable-background:new -70 0 141.7 141.7;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
<g>
<path fill="#FFFFFF" d="M65,82.3c-2.8,7.3-7.1,13.3-12.8,17.8c-8.1,6.4-16.7,9.6-25.9,9.6c-9.3,0-16.2-3-20.5-9.1
c-2.9-4-4.3-8.7-4.2-13.8c0.1-5.2,1.2-11.6,3.4-19.2c2.1-7.6,4.6-14,7.4-19.2c2.8-5.2,6.8-9.8,11.9-13.8c7.8-6.1,16.3-9.2,25.6-9.2
c9.4,0,16.3,3.1,20.6,9.4c3.2,4.5,4.1,10.4,2.9,17.6H58.2c0.6-3.1,0.1-6-1.3-8.6c-1.7-3.4-5.4-5-10.9-5c-5,0-9.6,1.8-14,5.4
c-2.3,1.8-4.3,4.3-6,7.3c-1.7,3.1-2.9,5.6-3.6,7.7c-0.7,2.1-1.5,4.9-2.5,8.4c-1,3.5-1.7,6.3-2.2,8.4c-0.5,2.1-0.7,4.6-0.7,7.7
c0,3.1,0.7,5.5,1.9,7.3c2.4,3.6,6,5.4,11,5.4c5.4,0,10-1.7,13.7-5.2c2.9-2.6,4.9-5.6,6.2-8.9H65z"/>
<path fill="#FFFFFF" d="M136.7,40.3H95.4l-6.1,21.8h36.9l-3.7,13.4H85.5l-9.1,32.7H61.6l22.7-81.2h56.1L136.7,40.3z"/>
<path class="st0" d="M8.4,34.1c0,0,16.2,7.3,21.5,13.4c0,0-5.9-0.2-8.1,3.3c-2.6,3.8-1.3,11.4,6.8,17.1s17.7,6.3,22.5,6.6
c4.8,0.2,9.6,1.3,10.6,3.5C61.4,78.1,62.9,51.6,8.4,34.1z M38.7,61.1c-1-4,2.2-5.5,6.6-3.8c4,1.8,10.6,12.1,10.6,12.1
C50.6,68.7,39.9,65.2,38.7,61.1z"/>
<path class="st0" d="M-68.6,10.4l9,19.7l-8.6-3l2.6,4.8c0,0,3.5,6.8,11.9,21.5c6.6,11.4,18.2,17.1,33.8,16.4c0.5,0,1.3,0,2,0
c9.6-0.5,31.6-3,32.6-3h0.2l10.3-4L-68.6,10.4z M-20.1,65.5c-5.5,0.2-10.6-0.5-14.9-2c-6.3-2.2-11.4-6.3-14.9-12.3
c-4.3-7.6-7.3-12.9-9-16.4l7.9,2.8L-59,20.8l74.2,40.9l-1.3,0.5c-0.5,0-1.8,0.2-3.8,0.5l-50-20.2L-2.2,64
C-9,64.4-16.4,65.2-20.1,65.5z"/>
<path class="st0" d="M24.8,59.4c0,0-31.6-8.3-26.8,16.4c3.1,16.2,21.3,6.8,27.9,0.7C32.4,70.5,27,60.2,24.8,59.4z"/>
<path class="st0" d="M41.5,96.8c-14.2-6.1-22.8-16-33.6-15.2C1.3,82.1-5.7,87.6-8.5,95c4,3.3,10.1,5.5,19.7,2c0,0-6.6,8.1-20.4,7.3
c0.2,1.8,1,3.3,1.8,5c1.3,2,3,4,5,5.5c5.9-0.7,13.9-3.5,21.7-12.1c0,0-0.7,9-7.9,17.1c3.8,0.5,7.9,0.5,12.1,0.2
c3.3-1.8,7.9-5,7.9-10.9c0,0,1.5,4.6-0.7,9.9c6.6-1.3,13.4-3.8,19.9-7.6C65.2,103,70,93.2,70,93.2S55.9,102.5,41.5,96.8z
M51.8,107.3c-0.7-2-1-6.1-1-6.1c4.6,0.5,10.1-1.5,10.1-1.5C57.2,104.6,51.8,107.3,51.8,107.3z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before After
Before After

View file

@ -4,9 +4,15 @@
viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
<style type="text/css">
.st0{fill:#707173;}
.st1{fill:#9C9E9F;}
</style>
<path class="st0" d="M44.8,5.1C25,5.1,8.7,20.6,7.5,40.1h14.4c1.2-11.6,11-20.7,22.9-20.7c12.7,0,23.1,10.3,23.1,23.1
S57.5,65.5,44.8,65.5c-5,0-9.6-1.6-13.4-4.3v0l-11.3,9.2c6.6,5.8,15.2,9.4,24.7,9.4c20.6,0,37.4-16.8,37.4-37.4S65.4,5.1,44.8,5.1z"
/>
<polygon class="st0" points="1.7,31 12.8,58.2 30.9,35.1 "/>
<g>
<path class="st0" d="M82.4,48.7V26.9C75.6,17.3,60,10.6,41.9,10.6C24.3,10.6,9.1,16.9,2,26.1v22.8c7.1-9.2,22.3-15.5,39.9-15.5
c17.8,0,33.1,6.5,40.1,15.8C82.2,49,82.3,48.8,82.4,48.7z"/>
<g>
<path class="st1" d="M61.7,64.8c9.2-2.9,16.6-7.6,20.7-13.4V29.7c-0.1-0.2-0.2-0.4-0.4-0.5c-4.2,5.6-11.4,10.1-20.3,12.9V64.8z"/>
<path class="st1" d="M36.8,67.4V44.6C21.4,43.5,8.4,37.6,2,29.3v22.9C8.4,60.4,21.4,66.4,36.8,67.4z"/>
</g>
<polygon class="st1" points="28.4,72.3 58.3,54.8 28.3,36.6 "/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 948 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

View file

@ -1,86 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg4057" sodipodi:docname="light-wide-1.svg" inkscape:version="0.91 r13725" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="49 39.4 239.9 62.3"
enable-background="new 49 39.4 239.9 62.3" xml:space="preserve">
<sodipodi:namedview id="base" fit-margin-bottom="0" inkscape:window-width="1011" inkscape:pageopacity="0.0" inkscape:pageshadow="2" fit-margin-right="0" inkscape:window-height="666" inkscape:window-maximized="0" inkscape:document-units="px" inkscape:window-y="241" inkscape:current-layer="layer1" inkscape:window-x="2360" inkscape:showpageshadow="false" showgrid="true" inkscape:cy="-40.407035" bordercolor="#666666" borderopacity="1.0" fit-margin-top="0" fit-margin-left="0" borderlayer="false" inkscape:zoom="1.4" showguides="false" showborder="true" inkscape:cx="271.31351" pagecolor="#ffffff">
id="svg4057" sodipodi:docname="light-wide-1.svg" inkscape:version="0.91 r13725" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-21 39.4 239.9 62.3"
style="enable-background:new -21 39.4 239.9 62.3;" xml:space="preserve">
<style type="text/css">
.st0{fill:#FFBB00;}
.st1{fill:#FFFFFF;}
</style>
<sodipodi:namedview inkscape:window-maximized="0" inkscape:pageopacity="0.0" inkscape:current-layer="layer1" inkscape:showpageshadow="false" inkscape:window-y="241" inkscape:window-height="666" inkscape:pageshadow="2" fit-margin-bottom="0" inkscape:window-x="2360" fit-margin-right="0" inkscape:window-width="1011" inkscape:document-units="px" id="base" borderopacity="1.0" bordercolor="#666666" fit-margin-left="0" inkscape:cx="271.31351" inkscape:zoom="1.4" showgrid="true" inkscape:cy="-40.407035" fit-margin-top="0" borderlayer="false" showborder="true" showguides="false" pagecolor="#ffffff">
<inkscape:grid type="xygrid" id="grid4093" originy="-961.96023" originx="-10.04131"></inkscape:grid>
</sodipodi:namedview>
<g id="layer1" transform="translate(-10.04131,-12.483937)" inkscape:groupmode="layer" inkscape:label="Layer 1">
<path id="path3751" inkscape:connector-curvature="0" fill="#56AC1D" d="M102.3,85.1h15.2v0.1l-7.6,4.5h-8.2c-1.8,0-3.4,1.5-5,4.5
c-1.1,1.8-1.7,2.9-1.7,3.5c0.1,0.7,0.5,1,1.1,1l0.2,0.1l0.7-0.1h10.3l0.1,0.1h0.1c-1.6,3-2.5,4.5-2.6,4.5H95l-0.7,0.1l-0.6-0.1
h-2.3c-1.6,0-2.6-0.5-2.9-1.5c-0.1-0.1-0.1-0.4-0.2-0.9c0-1,0.8-2.6,2.3-5l4.2-7.1C96.8,86.4,99.3,85.1,102.3,85.1z"/>
<path id="path3753" inkscape:connector-curvature="0" fill="#56AC1D" d="M121.6,85.2v0.1l-7.8,13.5h15.8v0.1l-7.9,4.5H106
c0-0.1,1.7-3.1,5-8.9l5.4-9.4l0.1-0.1L121.6,85.2L121.6,85.2z"/>
<path id="path3755" inkscape:connector-curvature="0" fill="#56AC1D" d="M156.5,85.2v0.1l-7.6,4.5h-10.6l-1.5,2.8h7.3v0.1
c-4,2.3-6.1,3.5-6.3,3.6h-3.1c-0.7,1.1-1.2,1.9-1.5,2.7h15.7l0.1,0.1h0.1c-1.5,2.7-2.4,4.2-2.6,4.4h-20.9l-0.1-0.1h-0.1l10.3-18.2
C135.7,85.2,156.5,85.2,156.5,85.2z"/>
<path id="path3757" inkscape:connector-curvature="0" fill="#56AC1D" d="M168.3,85.1c2,0,3.3,0.6,3.8,1.8l0.1,0.7v0.2
c0,0.8-0.7,2.3-2.1,4.6c-4.1,7.2-6.3,10.9-6.4,11.1h-5.1l2.5-4.5h-7.9c-0.1,0.1-1,1.7-2.6,4.5l-0.1,0.1h-5.2v-0.1
c5.1-8.9,7.8-13.7,8.3-14.4c1.4-1.5,2.5-2.5,3.4-2.8c1.1-0.6,2.2-0.9,3.3-1L168.3,85.1L168.3,85.1z M161,85.2h7.7
c1.8,0,2.9,0.7,3.5,2l0.1,0.4c0,0.9-0.9,2.7-2.7,5.5c-1.8,3.2-3.7,6.5-5.9,10.2l-0.2,0.1h-4.7l-0.1-0.1l2.4-4.3v-0.2h-7.9
c-0.1,0.1-1,1.7-2.6,4.5l-0.3,0.1h-4.8l-0.1-0.1h-0.1c5-8.9,7.8-13.6,8.2-14.2C155.8,86.5,158.3,85.2,161,85.2L161,85.2z
M155.7,94.4h7c0.8,0,1.2-0.1,1.2-0.4c1.2-1.7,1.8-2.8,1.8-3.2v-0.4c-0.2-0.4-0.7-0.7-1.6-0.7h-3.2C158.8,89.8,157,91.3,155.7,94.4
L155.7,94.4z M155.8,94.4h7.9c1.3-2.1,2-3.2,2-3.5v-0.2c0-0.6-0.6-0.9-1.9-0.9h-2.6c-2,0-3.6,1.1-4.7,3.4
C156.1,93.9,155.8,94.3,155.8,94.4z"/>
<path id="path3759" inkscape:connector-curvature="0" fill="#56AC1D" d="M187.5,85.2c1.9,0,3.1,0.5,3.7,1.4
c0.1,0.3,0.2,0.6,0.2,0.9v0.1c0,0.9-0.7,2.4-2.2,4.7c-3.5,6.4-5.6,10.1-6.3,11.1h-5.1v-0.1l6.6-11.7c0.2-0.4,0.3-0.7,0.3-1v-0.2
c0-0.5-0.4-0.7-1.1-0.7h-6c-5.1,9-7.7,13.6-7.9,13.7h-5c0-0.1,1.7-3.2,5.1-9.1l5.3-9.1L187.5,85.2L187.5,85.2z"/>
<path id="path3761" inkscape:connector-curvature="0" fill="#949494" d="M194.6,85.2h20.8v0.1l-7.5,4.5h-10.6
c-0.1,0-0.6,0.9-1.7,2.8h7.3v0.1l-6.1,3.5h-3.4c-0.9,1.8-2.3,4.2-4.1,7.2h-5.1v-0.1L194.6,85.2L194.6,85.2z"/>
<path id="path3763" inkscape:connector-curvature="0" fill="#949494" d="M219.6,85.2v0.1l-7.8,13.5h15.8v0.1l-7.9,4.5h-15.7
c0-0.1,1.7-3.1,5-8.9l5.4-9.4l0.1-0.1L219.6,85.2L219.6,85.2z"/>
<path id="path3765" inkscape:connector-curvature="0" fill="#949494" d="M233.6,85.2h5.1l0.1,0.1l-10.3,18.1h-5.1
C223.8,102.7,227.2,96.6,233.6,85.2z"/>
<path id="path3767" inkscape:connector-curvature="0" fill="#949494" d="M245.1,85.2h15.2v0.1l-7.6,4.5h-8.1
c-1.8,0-3.4,1.5-4.9,4.5c-1,1.5-1.6,2.6-1.7,3.3V98c0,0.5,0.4,0.8,1.3,0.9h5.6c0.1,0,0.6-0.9,1.5-2.7h-7.7v-0.1l6.1-3.5h8.7
l0.1,0.1h0.1l-6.1,10.8h-13.1c-2.3,0-3.4-0.8-3.4-2.3c0-1.1,0.8-2.8,2.4-5.3c2.2-4.1,3.8-6.7,4.8-7.8
C240.4,86.2,242.7,85.2,245.1,85.2L245.1,85.2z"/>
<path id="path3769" inkscape:connector-curvature="0" fill="#949494" d="M265.1,85.2v0.1l-4.1,7.2h1.9l5.9,0.1l4.2-7.4h5l0.1,0.1
l-10.3,18.2h-0.1l-5.1-0.1c0-0.1,1.3-2.5,4-7.1v-0.1h-7.8l-4.2,7.2h-5.1c0.2-0.6,1.7-3.2,4.4-7.9l5.9-10.3L265.1,85.2L265.1,85.2z"
/>
<path id="path3771" inkscape:connector-curvature="0" fill="#949494" d="M294.1,85.1l4.8,0.1v0.1l-7.5,4.6h-4.9
c-5.1,9.1-7.7,13.6-7.8,13.6h-5.1v-0.1l7.8-13.6H274v-0.1l7.6-4.6H294.1L294.1,85.1z"/>
<path id="path3773" inkscape:connector-curvature="0" fill="#949494" d="M60.1,83.1l1.1,0.1l1.5-0.3l1.7-0.8l1.8-1.2l1.4-1.2
l5.9,0.1l5.7-0.6l0.7,0.9l0.2,0.2l0.2,0.1l0.2,0l0.2,0l0.2-0.1l0.2-0.1l0.1-0.2l0.1-0.3l0,0l0.2,0.3l-0.9,1.8l0.1,0.1l0.3,0
l-0.6,0.9l0,0L80.2,83l-4,8.2l-0.2,0l-2.2,0.3l-2.3,0.9l-2.3,1.4L67,95.7L65,98l-1.7,2.6l-1.3,2.8l-0.7,2.8l-0.1,2.7l0.5,2.3
L63,113l1.9,1.1l2.5,0.2l2.9-0.8l3-1.8l2.8-2.5l2.4-3.1l1.7-3.3l1-3.2l0.2-2.9l-0.5-2.4l-0.4-0.6l0.5-0.9l2.7-6.2l0.1,0.1l0.3,0.1
l0.3,0.1l0.3,0l0.2,0l0.2-0.1l0.1-0.1l0.1-0.3l0-0.2l-0.1-0.2l-0.1-0.2l-0.8-0.9l0.1-0.1l0.1-1.4l0.4,0l0,0l0.8-1.8l1.4-1.1
l0.7-1.7l1.8-0.2l0.7-0.6l1.9-0.2l0,0l0.1-0.4l1.4,0.4l0.1,0l0.7,1l0.2,0.2L95,79l0.2,0l0.3,0l0.2-0.1l0.1-0.2l0.1-0.2l0.1-0.3
l0-0.3l0-0.3l0-0.1l6.5-0.7l0.7-0.1l0.4,0.5l2,1.2l2.7,0.7l3.3,0.1l3.6-0.6l3.6-1.3l3.2-1.9l2.6-2.4l1.7-2.5l0.6-2.5l-0.4-2.2
l-1.3-1.8l-2-1.3l-2.5-0.7l-2.8-0.1l-3,0.4l-2.9,0.8l-2.7,1.2l-2.4,1.5l-2,1.8l-1.5,2l-1,2l0,0.3l-8.6,1.3l-0.3,0l0,0l-1,0.3
l0.1-0.3l-0.1-0.1l-1.9,0.3l-0.5-0.5l0.3,0.1l0.3,0l0.3,0l0.2-0.1l0.2-0.1l0.1-0.2l0.1-0.2l0-0.2l0-0.2l-0.1-0.2l-0.6-0.9l2.3-5.3
l1.7-5.7l1.6-1l1.6-1.4l1.2-1.4l0.8-1.3l0.2-1.1l-0.3-0.9L99,52.1l-1.1-0.2L96.4,52l-1.6,0.4L93.1,53l-1.7,0.9L89.9,55l-1.4,1.2
l-1.2,1.2l-0.8,1.2L86,59.7l0,1l0.4,0.7l0.9,0.4l1.3,0.1l1.7-0.3l0.2-0.1L86.9,69l-0.1,0.2l0,0L86.6,70l-0.4,0.1l0,0l-0.7,1.4
l-4.3,3.2l-1.5,0.2l-0.2,0.4l-0.8,0l0,0l-0.2,0l-7.9,1.2l0.2-0.2l0.8-1.5l0.3-1.3l-0.1-1L71,71.8l-0.9-0.3l-1.2,0.1L67.6,72
l-1.5,0.7l-1.5,1L63.1,75l-1.3,1.4l-1.1,1.4l-0.9,1.4l-0.5,1.3L59,81.7l0.3,0.9L60.1,83.1L60.1,83.1z M93.2,62L93.2,62L93.2,62
l-0.4,0.2l0.3-0.6l0,0l0,0l0,0l0,0.1l0,0.1l0,0.1l0,0.1L93.2,62C93.2,62,93.2,62,93.2,62z M92.6,62.6L92.6,62.6l0.1,0l0,0l0,0
l0,0.1l0,0.1l-0.1,0.1L92.5,63L92.4,63l-0.1,0.1l0,0C92.3,63.1,92.6,62.6,92.6,62.6z M92.3,63.4L92.3,63.4l0.2,0l0,0l0,0l0,0.1
l0,0.1l-0.1,0.1l-0.1,0.1l-0.1,0.1l-0.1,0.1L92,64l-0.1,0L92.3,63.4C92.2,63.4,92.3,63.4,92.3,63.4z M90.2,72l-0.1,0L90,72l-0.1,0
l-0.1,0l0.1-0.3l0.1,0l0.1,0.1l0.1,0.1l0.1,0.1L90.2,72C90.3,71.9,90.2,72,90.2,72z M91.1,75.9L91.1,75.9L91.1,75.9
C91.1,75.9,91.1,75.9,91.1,75.9z M95.3,77.9L95.3,77.9L95.3,77.9L95.3,77.9z M95.1,77.7l0,0.1l0,0L95,77.7l-0.1-0.1l0,0l0.2,0
C95.1,77.5,95.1,77.7,95.1,77.7z M84,85.6l0.1,0.1l0.1,0.1l0,0l-0.1,0l-0.1,0l-0.1,0L84,85.6C84,85.6,84,85.6,84,85.6z M87.1,78.3
L87.1,78.3L87.1,78.3L87.1,78.3L87.1,78.3L87.1,78.3L87.1,78.3L87.1,78.3L87.1,78.3z M87.2,78.2L87.2,78.2L87.2,78.2L87.2,78.2z
M87.1,75.1L87.1,75.1L87.1,75.1C87,75.1,87.1,75.1,87.1,75.1z M89.9,64.8l0-0.1l0-0.1l0-0.1l0.9-2l0.4-0.1l0,0l0,0.1l0,0.1
l-0.7,2.2L89.9,64.8C89.9,64.9,89.9,64.8,89.9,64.8z M92,61.3L92,61.3L92,61.3C92.1,61.3,92,61.3,92,61.3z M90.3,65.3L90.3,65.3
L90.3,65.3l-0.1,0.1l-0.1-0.1L90,65.2l0,0l0,0l0.1,0l0.1,0l0.1,0C90.3,65.2,90.3,65.3,90.3,65.3z M87,73.8L87,73.8L87,73.8L87,73.8
z M101.9,73.3L101.9,73.3l-0.1-0.2l0-0.1l0.1-0.1l0.1,0C102,72.8,101.9,73.3,101.9,73.3z M92.3,61.3L92.3,61.3L92.3,61.3L92.3,61.3
z M85.9,76.5L85.9,76.5L85.9,76.5L85.9,76.5z M85.8,73.4L85.8,73.4L85.8,73.4L85.8,73.4z M82.8,76.9L82.8,76.9L82.8,76.9
C82.8,76.9,82.8,76.9,82.8,76.9z M84,77.3L84,77.3L84,77.3C84,77.3,84,77.3,84,77.3z M82.9,75.5L82.9,75.5L82.9,75.5L82.9,75.5z
M77.2,91.4L77.2,91.4l0.1-0.2l0.1-0.1l0.1-0.1l0,0l0.1,0l0.1,0.1l0.1,0.1l0.1,0.2l0,0.1C77.9,91.5,77.2,91.4,77.2,91.4z
M79.6,92.5l-0.5-0.3l0.4-0.9l0.1-0.1l0.1-0.1l0.3,0l0,0l0.1,0.1l0.1,0.2l0,0.2l0,0.2l0,0.2l-0.1,0.2l-0.3,0.6L79.6,92.5z
M83.5,81.6L83.5,81.6L83.5,81.6L83.5,81.6z M102.3,75.5l0.2,0.3l-0.4,0.1l-0.2,0l-0.2,0l-0.2-0.1l-0.2-0.1l-0.1-0.1l-0.1-0.1
l0.1-0.4l0,0l0.2,0l0.7-0.1C102.2,74.9,102.3,75.5,102.3,75.5z M90.3,72L90.3,72L90.3,72L90.3,72z M91.9,64.4L91.9,64.4l0.6-0.2
l-0.2,0.7l0,0.1l0,0l-0.1,0l-0.1-0.1L92,64.8l-0.1-0.1l0-0.1C91.9,64.5,91.9,64.4,91.9,64.4z M84.2,74.1L84.2,74.1L84.2,74.1
L84.2,74.1z M84,74.2L84,74.2L84,74.2C84,74.2,84,74.2,84,74.2z M80,79L80,79l0.4-0.1l0,0l0,0.1l0,0.1l0,0.1l-0.1,0.1l0,0l-0.1-0.1
l-0.1-0.1L80,79.2C80,79.2,80,79,80,79z M73.3,76.8l0.1,0l0.1,0l0.1,0l-0.3,0.5l-2.2,0l-0.1,0l-0.1,0l0,0l0.2-0.3L73.3,76.8z
M74,77.1L74,77.1l0.1,0.2l0,0.1l0,0l-0.1,0l-0.2,0l0,0l0-0.1L74,77.1L74,77.1C73.9,77.1,74,77.1,74,77.1z M70.3,77.1L70.3,77.1
L70.3,77.1L70.3,77.1z M73.1,79.1L73.1,79.1l-0.8,0l0.3-0.5l0.1,0l0.1,0.1l0.1,0.1l0.1,0.1L73,79L73.1,79.1L73.1,79.1
C73.1,79.1,73.1,79.1,73.1,79.1z M70.1,79.2L70.1,79.2l-0.1,0l-0.1,0l-0.1,0l-0.1,0l0-0.1l0,0l0,0l0.7-0.1L70.1,79.2L70.1,79.2
C70.1,79.2,70.1,79.2,70.1,79.2z M70.7,78.9L70.7,78.9L70.7,78.9C70.7,78.8,70.7,78.9,70.7,78.9z M71.6,78.9L71.6,78.9L71.6,78.9
L71.6,78.9z M72.2,78.6L72.2,78.6l-0.1,0.2L72,78.9l-0.1,0.1l-0.1,0l-0.1,0l-0.1,0l0,0l0,0l0-0.1l0-0.1l0,0L72.2,78.6
C72.2,78.6,72.2,78.6,72.2,78.6z M71.2,78.8L71.2,78.8L71,78.9l-0.1,0l-0.1,0l-0.1,0l0,0l0,0l0-0.1l0,0L71.2,78.8
C71.3,78.7,71.2,78.8,71.2,78.8z"/>
<g>
<g>
<path class="st0" d="M56.2,61.9h9.7c4.7,0,4.7,2.6,4.1,4.4c-0.6,1.8-1.8,2.8-3.4,3.5c1.4,0.5,2.4,1.8,1.5,4.4
c-1.3,3.6-5,5.4-8.1,5.4H49.9L56.2,61.9z M56.9,75.4h3.2c1.1,0,2.3-0.3,2.7-1.7c0.4-1,0-1.6-1.3-1.6h-3.4L56.9,75.4z M59.2,68.8
h2.9c1.1,0,2-0.3,2.4-1.5c0.3-0.9-0.3-1.2-1.4-1.2h-2.9L59.2,68.8z"/>
<path class="st0" d="M74.9,61.9h14.7L88,66.4h-9.3l-0.8,2.2h8.4l-1.5,4.2h-8.4L75.7,75h9.5l-1.6,4.5h-15L74.9,61.9z"/>
<path class="st0" d="M94.7,66.4h-5l1.6-4.5h15.4l-1.6,4.5h-5l-4.7,13.2h-5.5L94.7,66.4z"/>
<path class="st0" d="M111.8,61.9h5.3l0.2,17.7h-5.6l0.2-2.5h-5.6l-1.7,2.5h-5.5L111.8,61.9z M112.1,73.3l0.3-5.5l0,0l-3.7,5.5
H112.1z"/>
<path class="st1" d="M125.1,61.9h13.7l-1.6,4.5H129l-0.8,2.2h7.1l-1.5,4.2h-7.1l-2.4,6.8h-5.5L125.1,61.9z"/>
<path class="st1" d="M140.9,61.9h5.5L141.7,75h7.9l-1.6,4.5h-13.3L140.9,61.9z"/>
<path class="st1" d="M156.2,61.9h5.5l-6.3,17.7h-5.5L156.2,61.9z"/>
<path class="st1" d="M172,77.8c-1.8,1.6-3.9,2.2-5.8,2.2c-5.2,0-7-4.1-5.2-9.1c2.4-6.8,8.1-9.5,12.1-9.5c4.5,0,6.5,2.5,5.8,6.6
h-5.2c0.3-1.3-0.5-2.2-1.8-2.2c-3.8,0-5,4-5.5,5.2c-0.6,1.7-0.9,4.6,2.4,4.6c1.3,0,2.8-0.6,3.5-2h-2.4l1.3-3.8h7.3l-3.5,9.8h-3.5
L172,77.8z"/>
<path class="st1" d="M184.3,61.9h5.5l-2.2,6.2h5.1l2.2-6.2h5.5l-6.3,17.7h-5.5l2.5-7H186l-2.5,7H178L184.3,61.9z"/>
<path class="st1" d="M205.6,66.4h-5l1.6-4.5h15.4l-1.6,4.5h-5l-4.7,13.2h-5.5L205.6,66.4z"/>
</g>
<path class="st0" d="M30.5,84c-4.8-2-8.3-5-11.7-6.3c1.8-0.8,3.5-1.9,4.5-2.9c1.1-1.1,1.5-2.4,1.4-3.7c3.6,2.4,7.8,2.6,10,2.7
c2.2,0.1,4.4,0.6,4.8,1.6c0,0,0.7-12.2-24.4-20.3c0,0,7.5,3.4,9.8,6.1c0,0-2.7-0.2-3.8,1.6c-0.6,0.9-0.7,2.2-0.2,3.7
c-0.4-0.1-0.9-0.1-1.4-0.2l-39.8-22.1l4.2,9l-3.9-1.4l1.2,2.2c0,0,1.7,3.2,5.5,9.9c3,5.3,8.4,7.9,15.6,7.6c0.3,0,0.6,0,0.9,0
c1.8-0.1,4.6-0.4,7.3-0.6c-0.2,1-0.2,2.2,0.1,3.6c0.3,1.6,1,2.7,1.8,3.3c-2.1,1-4.1,3-4.9,5.3c0,0,0,0,0,0c-0.6,1.5-0.8,3.2,0,5.3
c0,0,0,0,0,0c0.1,0.4,0.3,0.8,0.6,1.3c0.2,0.4,0.5,0.8,0.9,1.2c4.4,5.3,15.2,4.4,22,1.6c0.1,0,0.2-0.1,0.3-0.1
c0.5-0.2,1.1-0.5,1.6-0.7c0.1-0.1,0.2-0.1,0.3-0.2c0.6-0.3,1.1-0.6,1.7-0.9c6.7-3.9,9-8.5,9-8.5S37,86.7,30.5,84z M32.2,65.9
c1.9,0.8,4.8,5.6,4.8,5.6c-2.4-0.4-7.3-2-7.8-3.8S30.3,65.1,32.2,65.9z M25.9,89.5c0,0,0.5,1.6-0.1,3.7c-0.7,0.2-1.4,0.3-2.1,0.5
C24.9,92.8,25.9,91.4,25.9,89.5z M-7,59l17.3,9.8c-3.2,0.3-6.5,0.6-8.2,0.7c-2.6,0.1-4.9-0.2-6.9-0.9c-3-1-5.2-3-6.8-5.7
c-2-3.4-3.3-5.9-4.2-7.5l3.6,1.2l-3.6-7.7l31.5,17.4c-0.9,0.1-1.7,0.4-2.5,0.7L-7,59z M11.4,71.3c1.2-5.8,8.7-4,8.7-4
c-2.7,0-4.3,0.7-5.1,1.8c-1.2,1.6,0.3,2.9,0.3,2.9c-0.4-0.1-0.8-0.2-1-0.4c0,0,0,0,0,0.1c0.6,2.3,2.5,2.9,2.5,2.9
c-0.7,0.1-1.3,0-1.8-0.1c0.4,0.9,1,1.6,1.3,1.8c-1.7,0-2.5,0.4-3.1,0.6C11.9,76,10.8,73.8,11.4,71.3z M16.5,84.1
c0,0-2.7,3.4-8.6,3.4c-0.3-1.3-0.2-2.6,0.1-3.8C9.9,84.9,12.7,85.5,16.5,84.1z M11.6,92c2.5-0.6,5.7-2,8.7-5.4c0,0-0.4,3.8-3.2,7.3
c-1.3-0.2-2.6-0.5-3.8-1C12.7,92.6,12.1,92.3,11.6,92z M35.2,88.9c-0.3-0.9-0.5-2.8-0.5-2.8c2.1,0.2,4.6-0.7,4.6-0.7
C37.6,87.6,35.2,88.9,35.2,88.9z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before After
Before After

BIN
images/pattern.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

View file

@ -52,6 +52,18 @@ var BOARD_DEFINITIONS = [
name: "SP Racing F3 Mini",
identifier: "SRFM",
vcp: true
}, {
name: "SP Racing F3 EVO",
identifier: "SPEV",
vcp: true
}, {
name: "Alienflight F3",
identifier: "AFF3",
vcp: true
}, {
name: "ImmersionRC Fusion F3",
identifier: "IFF3",
vcp: false
}, {
name: "MotoLab",
identifier: "MOTO",

View file

@ -1,7 +1,7 @@
'use strict';
var CONFIGURATOR = {
'releaseDate': 1456164608903, // new Date().getTime() - Mon Feb 22 2016 19:10:05 GMT+0100
'releaseDate': 1463055533515, // new Date().getTime() - Thu May 12 2016 14:19:06 GMT+0200
// all versions are specified and compared using semantic versioning http://semver.org/
'apiVersionAccepted': '1.2.1',

View file

@ -244,7 +244,7 @@ GUI_control.prototype.content_ready = function (callback) {
$('.togglesmall').each(function(index, elem) {
var switchery = new Switchery(elem, {
size: 'small',
color: '#59aa29',
color: '#ffbb00',
secondaryColor: '#c4c4c4'
});
$(elem).on("change", function (evt) {
@ -255,7 +255,7 @@ GUI_control.prototype.content_ready = function (callback) {
$('.toggle').each(function(index, elem) {
var switchery = new Switchery(elem, {
color: '#59aa29',
color: '#ffbb00',
secondaryColor: '#c4c4c4'
});
$(elem).on("change", function (evt) {
@ -267,7 +267,7 @@ GUI_control.prototype.content_ready = function (callback) {
$('.togglemedium').each(function(index, elem) {
var switchery = new Switchery(elem, {
className: 'switcherymid',
color: '#59aa29',
color: '#ffbb00',
secondaryColor: '#c4c4c4'
});
$(elem).on("change", function (evt) {
@ -279,8 +279,8 @@ GUI_control.prototype.content_ready = function (callback) {
if (CONFIGURATOR.connectionValid) {
// Build link to in-use CF version documentation
var documentationButton = $('div#content #button-documentation');
documentationButton.html("Documentation for " + CONFIG.flightControllerVersion);
documentationButton.attr("href","https://github.com/cleanflight/cleanflight/tree/v{0}/docs".format(CONFIG.flightControllerVersion));
documentationButton.html("Wiki");
documentationButton.attr("href","https://github.com/betaflight/betaflight/wiki");
}
// loading tooltip

View file

@ -18,7 +18,7 @@
.jBox-container {
background: #fff;
border:1px solid #59aa29;
border:1px solid #ffbb00;
max-width:180px;
font-size:11px;
line-height:13px;
@ -83,7 +83,7 @@
background: #fff;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
border:1px solid #59aa29;
border:1px solid #ffbb00;
}

94
js/msp.js Normal file → Executable file
View file

@ -126,8 +126,11 @@ var MSP = {
unsupported: 0,
ledDirectionLetters: ['n', 'e', 's', 'w', 'u', 'd'], // in LSB bit order
ledFunctionLetters: ['i', 'w', 'f', 'a', 't', 'r', 'c'], // in LSB bit order
ledFunctionLetters: ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b'], // in LSB bit order
last_received_timestamp: null,
analog_last_received_timestamp: null,
supportedBaudRates: [ // 0 based index.
'AUTO',
'9600',
@ -139,8 +142,18 @@ var MSP = {
'250000',
],
serialPortFunctions: // in LSB bit order
['MSP', 'GPS', 'TELEMETRY_FRSKY', 'TELEMETRY_HOTT', 'TELEMETRY_MSP', 'TELEMETRY_SMARTPORT', 'RX_SERIAL', 'BLACKBOX'],
serialPortFunctions: {
'MSP': 0,
'GPS': 1,
'TELEMETRY_FRSKY': 2,
'TELEMETRY_HOTT': 3,
'TELEMETRY_MSP': 4,
'TELEMETRY_LTM': 4, // LTM replaced MSP
'TELEMETRY_SMARTPORT': 5,
'RX_SERIAL': 6,
'BLACKBOX': 7,
'TELEMETRY_MAVLINK': 8,
},
read: function (readInfo) {
var data = new Uint8Array(readInfo.data);
@ -224,6 +237,7 @@ var MSP = {
console.log('Unknown state detected: ' + this.state);
}
}
this.last_received_timestamp = Date.now();
},
process_data: function (code, message_buffer, message_length) {
var data = new DataView(message_buffer, 0); // DataView (allowing us to view arrayBuffer as struct/union)
@ -321,6 +335,7 @@ var MSP = {
ANALOG.mAhdrawn = data.getUint16(1, 1);
ANALOG.rssi = data.getUint16(3, 1); // 0-1023
ANALOG.amperage = data.getInt16(5, 1) / 100; // A
this.analog_last_received_timestamp = Date.now();
break;
case MSP_codes.MSP_RC_TUNING:
var offset = 0;
@ -363,20 +378,20 @@ var MSP = {
case 7:
case 8:
case 9:
PIDs[i][0] = data.getUint8(needle) / 10;
PIDs[i][1] = data.getUint8(needle + 1) / 1000;
PIDs[i][0] = data.getUint8(needle);
PIDs[i][1] = data.getUint8(needle + 1);
PIDs[i][2] = data.getUint8(needle + 2);
break;
case 4:
PIDs[i][0] = data.getUint8(needle) / 100;
PIDs[i][1] = data.getUint8(needle + 1) / 100;
PIDs[i][2] = data.getUint8(needle + 2) / 1000;
PIDs[i][0] = data.getUint8(needle);
PIDs[i][1] = data.getUint8(needle + 1);
PIDs[i][2] = data.getUint8(needle + 2);
break;
case 5:
case 6:
PIDs[i][0] = data.getUint8(needle) / 10;
PIDs[i][1] = data.getUint8(needle + 1) / 100;
PIDs[i][2] = data.getUint8(needle + 2) / 1000;
PIDs[i][0] = data.getUint8(needle);
PIDs[i][1] = data.getUint8(needle + 1);
PIDs[i][2] = data.getUint8(needle + 2);
break;
}
}
@ -420,8 +435,11 @@ var MSP = {
MISC.gps_ubx_sbas = data.getInt8(offset++);
MISC.multiwiicurrentoutput = data.getUint8(offset++);
MISC.rssi_channel = data.getUint8(offset++);
MISC.placeholder2 = data.getUint8(offset++);
MISC.mag_declination = data.getInt16(offset, 1) / 10; // -18000-18000
MISC.placeholder2 = data.getUint8(offset++);
if (semver.lt(CONFIG.apiVersion, "1.18.0"))
MISC.mag_declination = data.getInt16(offset, 1) / 10; // -1800-1800
else
MISC.mag_declination = data.getInt16(offset, 1) / 100; // -18000-18000
offset += 2;
MISC.vbatscale = data.getUint8(offset++, 1); // 10-200
MISC.vbatmincellvoltage = data.getUint8(offset++, 1) / 10; // 10-50
@ -435,8 +453,11 @@ var MSP = {
_3D.deadband3d_high = data.getUint16(offset, 1);
offset += 2;
_3D.neutral3d = data.getUint16(offset, 1);
offset += 2;
_3D.deadband3d_throttle = data.getUint16(offset, 1);
if (semver.lt(CONFIG.apiVersion, "1.17.0")) {
offset += 2;
_3D.deadband3d_throttle = data.getUint16(offset, 1);
}
break;
case MSP_codes.MSP_MOTOR_PINS:
console.log(data);
@ -1136,20 +1157,20 @@ MSP.crunch = function (code) {
case 7:
case 8:
case 9:
buffer.push(Math.round(PIDs[i][0] * 10));
buffer.push(Math.round(PIDs[i][1] * 1000));
buffer.push(parseInt(PIDs[i][0]));
buffer.push(parseInt(PIDs[i][1]));
buffer.push(parseInt(PIDs[i][2]));
break;
case 4:
buffer.push(Math.round(PIDs[i][0] * 100));
buffer.push(Math.round(PIDs[i][1] * 100));
buffer.push(parseInt(PIDs[i][0]));
buffer.push(parseInt(PIDs[i][1]));
buffer.push(parseInt(PIDs[i][2]));
break;
case 5:
case 6:
buffer.push(Math.round(PIDs[i][0] * 10));
buffer.push(Math.round(PIDs[i][1] * 100));
buffer.push(Math.round(PIDs[i][2] * 1000));
buffer.push(parseInt(PIDs[i][0]));
buffer.push(parseInt(PIDs[i][1]));
buffer.push(parseInt(PIDs[i][2]));
break;
}
}
@ -1220,8 +1241,13 @@ MSP.crunch = function (code) {
buffer.push(MISC.multiwiicurrentoutput);
buffer.push(MISC.rssi_channel);
buffer.push(MISC.placeholder2);
buffer.push(lowByte(Math.round(MISC.mag_declination * 10)));
buffer.push(highByte(Math.round(MISC.mag_declination * 10)));
if (semver.lt(CONFIG.apiVersion, "1.18.0")) {
buffer.push(lowByte(Math.round(MISC.mag_declination * 10)));
buffer.push(highByte(Math.round(MISC.mag_declination * 10)));
} else {
buffer.push(lowByte(Math.round(MISC.mag_declination * 100)));
buffer.push(highByte(Math.round(MISC.mag_declination * 100)));
}
buffer.push(MISC.vbatscale);
buffer.push(Math.round(MISC.vbatmincellvoltage * 10));
buffer.push(Math.round(MISC.vbatmaxcellvoltage * 10));
@ -1321,8 +1347,10 @@ MSP.crunch = function (code) {
buffer.push(highByte(_3D.deadband3d_high));
buffer.push(lowByte(_3D.neutral3d));
buffer.push(highByte(_3D.neutral3d));
buffer.push(lowByte(_3D.deadband3d_throttle));
buffer.push(highByte(_3D.deadband3d_throttle));
if (semver.lt(CONFIG.apiVersion, "1.17.0")) {
buffer.push(lowByte(_3D.deadband3d_throttle));
buffer.push(highByte(_3D.deadband3d_throttle));
}
break;
case MSP_codes.MSP_SET_RC_DEADBAND:
@ -1617,9 +1645,12 @@ MSP.sendLedStripConfig = function(onCompleteCallback) {
MSP.serialPortFunctionMaskToFunctions = function(functionMask) {
var functions = [];
for (var index = 0; index < MSP.serialPortFunctions.length; index++) {
if (bit_check(functionMask, index)) {
functions.push(MSP.serialPortFunctions[index]);
var keys = Object.keys(MSP.serialPortFunctions);
for (var index = 0; index < keys.length; index++) {
var key = keys[index];
var bit = MSP.serialPortFunctions[key];
if (bit_check(functionMask, bit)) {
functions.push(key);
}
}
return functions;
@ -1627,8 +1658,10 @@ MSP.serialPortFunctionMaskToFunctions = function(functionMask) {
MSP.serialPortFunctionsToMask = function(functions) {
var mask = 0;
var keys = Object.keys(MSP.serialPortFunctions);
for (var index = 0; index < functions.length; index++) {
var bitIndex = MSP.serialPortFunctions.indexOf(functions[index]);
var key = functions[index];
var bitIndex = MSP.serialPortFunctions[key];
if (bitIndex >= 0) {
mask = bit_set(mask, bitIndex);
}
@ -1673,4 +1706,3 @@ MSP.SDCARD_STATE_CARD_INIT = 2;
MSP.SDCARD_STATE_FS_INIT = 3;
MSP.SDCARD_STATE_READY = 4;

View file

@ -163,8 +163,6 @@ STM32_protocol.prototype.initialize = function () {
$('span.progressLabel').text('STM32 - timed out, programming: FAILED');
self.progress_bar_e.addClass('invalid');
googleAnalytics.sendEvent('Flashing', 'Programming', 'timeout');
// protocol got stuck, clear timer and disconnect
GUI.interval_remove('STM32_timeout');
@ -700,7 +698,6 @@ STM32_protocol.prototype.upload_procedure = function (step) {
if (verify) {
console.log('Programming: SUCCESSFUL');
$('span.progressLabel').text('Programming: SUCCESSFUL');
googleAnalytics.sendEvent('Flashing', 'Programming', 'success');
// update progress bar
self.progress_bar_e.addClass('valid');
@ -710,7 +707,6 @@ STM32_protocol.prototype.upload_procedure = function (step) {
} else {
console.log('Programming: FAILED');
$('span.progressLabel').text('Programming: FAILED');
googleAnalytics.sendEvent('Flashing', 'Programming', 'fail');
// update progress bar
self.progress_bar_e.addClass('invalid');
@ -771,4 +767,4 @@ STM32_protocol.prototype.upload_procedure = function (step) {
};
// initialize object
var STM32 = new STM32_protocol();
var STM32 = new STM32_protocol();

View file

@ -714,7 +714,6 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
if (verify) {
console.log('Programming: SUCCESSFUL');
$('span.progressLabel').text('Programming: SUCCESSFUL');
googleAnalytics.sendEvent('Flashing', 'Programming', 'success');
// update progress bar
self.progress_bar_e.addClass('valid');
@ -724,7 +723,6 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
} else {
console.log('Programming: FAILED');
$('span.progressLabel').text('Programming: FAILED');
googleAnalytics.sendEvent('Flashing', 'Programming', 'fail');
// update progress bar
self.progress_bar_e.addClass('invalid');
@ -769,4 +767,4 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
};
// initialize object
var STM32DFU = new STM32DFU_protocol();
var STM32DFU = new STM32DFU_protocol();

View file

@ -35,7 +35,6 @@ var serial = {
self.onReceiveError.addListener(function watch_for_on_receive_errors(info) {
console.error(info);
googleAnalytics.sendException('Serial: ' + info.error, false);
switch (info.error) {
case 'system_error': // we might be able to recover from this one
@ -45,13 +44,11 @@ var serial = {
if (info) {
if (!info.paused) {
console.log('SERIAL: Connection recovered from last onReceiveError');
googleAnalytics.sendException('Serial: onReceiveError - recovered', false);
self.failed = 0;
} else {
console.log('SERIAL: Connection did not recover from last onReceiveError, disconnecting');
GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
googleAnalytics.sendException('Serial: onReceiveError - unrecoverable', false);
if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click();
@ -82,7 +79,6 @@ var serial = {
// assume unrecoverable, disconnect
console.log('SERIAL: Connection did not recover from ' + self.error + ' condition, disconnecting');
GUI.log('Unrecoverable <span style="color: red">failure</span> of serial connection, disconnecting...');
googleAnalytics.sendException('Serial: ' + self.error + ' - unrecoverable', false);
if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click();
@ -92,7 +88,6 @@ var serial = {
}
else {
console.log('SERIAL: Connection recovered from ' + self.error + ' condition');
googleAnalytics.sendException('Serial: ' + self.error + ' - recovered', false);
}
}
});
@ -105,7 +100,11 @@ var serial = {
break;
case 'device_lost':
// TODO
if (GUI.connected_to || GUI.connecting_to) {
$('a.connect').click();
} else {
self.disconnect();
}
break;
case 'disconnected':
@ -140,7 +139,6 @@ var serial = {
} else {
self.openRequested = false;
console.log('SERIAL: Failed to open serial port');
googleAnalytics.sendException('Serial: FailedToOpen', false);
if (callback) callback(false);
}
});
@ -169,7 +167,6 @@ var serial = {
console.log('SERIAL: Connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
} else {
console.log('SERIAL: Failed to close connection with ID: ' + self.connectionId + ' closed, Sent: ' + self.bytesSent + ' bytes, Received: ' + self.bytesReceived + ' bytes');
googleAnalytics.sendException('Serial: FailedToClose', false);
}
self.connectionId = false;
@ -287,4 +284,4 @@ var serial = {
this.outputBuffer = [];
this.transmitting = false;
}
};
};

View file

@ -190,17 +190,14 @@ function onOpen(openInfo) {
MSP.send_message(MSP_codes.MSP_FC_VERSION, false, false, function () {
googleAnalytics.sendEvent('Firmware', 'Variant', CONFIG.flightControllerIdentifier + ',' + CONFIG.flightControllerVersion);
GUI.log(chrome.i18n.getMessage('fcInfoReceived', [CONFIG.flightControllerIdentifier, CONFIG.flightControllerVersion]));
MSP.send_message(MSP_codes.MSP_BUILD_INFO, false, false, function () {
googleAnalytics.sendEvent('Firmware', 'Using', CONFIG.buildInfo);
GUI.log(chrome.i18n.getMessage('buildInfoReceived', [CONFIG.buildInfo]));
MSP.send_message(MSP_codes.MSP_BOARD_INFO, false, false, function () {
googleAnalytics.sendEvent('Board', 'Using', CONFIG.boardIdentifier + ',' + CONFIG.boardVersion);
GUI.log(chrome.i18n.getMessage('boardInfoReceived', [CONFIG.boardIdentifier, CONFIG.boardVersion]));
MSP.send_message(MSP_codes.MSP_UID, false, false, function () {
@ -264,7 +261,9 @@ function onConnect() {
port_picker.hide();
var dataflash = $('#dataflash_wrapper_global');
dataflash.show();
dataflash.show();
startLiveDataRefreshTimer();
}
@ -286,6 +285,9 @@ function onClosed(result) {
var dataflash = $('#dataflash_wrapper_global');
dataflash.hide();
var battery = $('#quad-status_wrapper');
battery.hide();
}
function read_serial(info) {
@ -299,7 +301,7 @@ function read_serial(info) {
function sensor_status(sensors_detected) {
// initialize variable (if it wasn't)
if (!sensor_status.previous_sensors_detected) {
sensor_status.previous_sensors_detected = 0;
sensor_status.previous_sensors_detected = -1; // Otherwise first iteration will not be run if sensors_detected == 0
}
// update UI (if necessary)
@ -321,7 +323,7 @@ function sensor_status(sensors_detected) {
$('.accicon', e_sensor_status).removeClass('active');
}
if (have_sensor(sensors_detected, 'gyro')) {
if (true) { // Gyro status is not reported by FC
$('.gyro', e_sensor_status).addClass('on');
$('.gyroicon', e_sensor_status).addClass('active');
} else {
@ -339,7 +341,7 @@ function sensor_status(sensors_detected) {
if (have_sensor(sensors_detected, 'mag')) {
$('.mag', e_sensor_status).addClass('on');
$('.magicon', e_sensor_status).addClass('active');
$('.magicon', e_sensor_status).addClass('active');
} else {
$('.mag', e_sensor_status).removeClass('on');
$('.magicon', e_sensor_status).removeClass('active');
@ -347,7 +349,7 @@ function sensor_status(sensors_detected) {
if (have_sensor(sensors_detected, 'gps')) {
$('.gps', e_sensor_status).addClass('on');
$('.gpsicon', e_sensor_status).addClass('active');
$('.gpsicon', e_sensor_status).addClass('active');
} else {
$('.gps', e_sensor_status).removeClass('on');
$('.gpsicon', e_sensor_status).removeClass('active');
@ -365,7 +367,6 @@ function sensor_status(sensors_detected) {
function have_sensor(sensors_detected, sensor_code) {
switch(sensor_code) {
case 'acc':
case 'gyro':
return bit_check(sensors_detected, 0);
case 'baro':
return bit_check(sensors_detected, 1);
@ -385,34 +386,117 @@ function highByte(num) {
function lowByte(num) {
return 0x00FF & num;
}function update_dataflash_global() {
var supportsDataflash = DATAFLASH.totalSize > 0;
if (supportsDataflash){
}
$(".noflash_global").css({
display: 'none'
});
function update_dataflash_global() {
var supportsDataflash = DATAFLASH.totalSize > 0;
if (supportsDataflash){
$(".dataflash-contents_global").css({
display: 'block'
});
$(".noflash_global").css({
display: 'none'
});
$(".dataflash-contents_global").css({
display: 'block'
});
$(".dataflash-free_global").css({
width: (100-(DATAFLASH.totalSize - DATAFLASH.usedSize) / DATAFLASH.totalSize * 100) + "%",
display: 'block'
});
$(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(DATAFLASH.totalSize - DATAFLASH.usedSize));
} else {
$(".noflash_global").css({
display: 'block'
});
$(".dataflash-free_global").css({
width: (100-(DATAFLASH.totalSize - DATAFLASH.usedSize) / DATAFLASH.totalSize * 100) + "%",
display: 'block'
});
$(".dataflash-free_global div").text('Dataflash: free ' + formatFilesize(DATAFLASH.totalSize - DATAFLASH.usedSize));
} else {
$(".noflash_global").css({
display: 'block'
});
$(".dataflash-contents_global").css({
display: 'none'
});
}
$(".dataflash-contents_global").css({
display: 'none'
});
}
}
function startLiveDataRefreshTimer() {
// live data refresh
GUI.timeout_add('data_refresh', function () { update_live_status(); }, 100);
}
function update_live_status() {
var statuswrapper = $('#quad-status_wrapper');
$(".quad-status-contents").css({
display: 'inline-block'
});
if (GUI.active_tab != 'cli') {
MSP.send_message(MSP_codes.MSP_BOXNAMES, false, false);
MSP.send_message(MSP_codes.MSP_STATUS, false, false);
MSP.send_message(MSP_codes.MSP_ANALOG, false, false);
}
var active = ((Date.now() - MSP.analog_last_received_timestamp) < 300);
for (var i = 0; i < AUX_CONFIG.length; i++) {
if (AUX_CONFIG[i] == 'ARM') {
if (bit_check(CONFIG.mode, i))
$(".armedicon").css({
'background-image': 'url(images/icons/cf_icon_armed_active.svg)'
});
else
$(".armedicon").css({
'background-image': 'url(images/icons/cf_icon_armed_grey.svg)'
});
}
if (AUX_CONFIG[i] == 'FAILSAFE') {
if (bit_check(CONFIG.mode, i))
$(".failsafeicon").css({
'background-image': 'url(images/icons/cf_icon_failsafe_active.svg)'
});
else
$(".failsafeicon").css({
'background-image': 'url(images/icons/cf_icon_failsafe_grey.svg)'
});
}
}
if (ANALOG != undefined) {
var nbCells = Math.floor(ANALOG.voltage / MISC.vbatmaxcellvoltage) + 1;
if (ANALOG.voltage == 0)
nbCells = 1;
var min = MISC.vbatmincellvoltage * nbCells;
var max = MISC.vbatmaxcellvoltage * nbCells;
var warn = MISC.vbatwarningcellvoltage * nbCells;
$(".battery-status").css({
width: ((ANALOG.voltage - min) / (max - min) * 100) + "%",
display: 'inline-block'
});
if (active) {
$(".linkicon").css({
'background-image': 'url(images/icons/cf_icon_link_active.svg)'
});
} else {
$(".linkicon").css({
'background-image': 'url(images/icons/cf_icon_link_grey.svg)'
});
}
if (ANALOG.voltage < warn) {
$(".battery-status").css('background-color', '#D42133');
} else {
$(".battery-status").css('background-color', '#59AA29');
}
$(".battery-legend").text(ANALOG.voltage + " V");
}
statuswrapper.show();
GUI.timeout_remove('data_refresh');
startLiveDataRefreshTimer();
}
function specificByte(num, pos) {
return 0x000000FF & (num >> (8 * pos));

230
main.css
View file

@ -60,22 +60,22 @@ a.disabled {
.cf_doc_version_bt a {
padding: 1px 9px 1px 9px;
margin-top: -45px;
background-color: #59aa29;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;
border: 1px solid #e8b423;
color: #000;
float: right;
font-family: 'open_sansbold', Arial;
font-size: 10px;
line-height: 17px;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
text-transform: uppercase;
letter-spacing: 0.03em;
display: block;
}
.cf_doc_version_bt a:hover {
background-color: #6ac435;
background-color: #fecb3f;
transition: all ease 0.2s;
}
@ -128,15 +128,15 @@ input[type="number"]::-webkit-inner-spin-button {
background-position: left center;
background-size: contain;
margin-left: 15px;
margin-top: 15px;
margin-top: 18px;
}
.logo_text {
position: absolute;
height: 20px;
width: 125px;
left: 31px;
top: 63px;
width: 112px;
left: 80px;
top: 50px;
color: #949494;
opacity: 0.5;
}
@ -450,7 +450,7 @@ input[type="number"]::-webkit-inner-spin-button {
#log a {
font-weight: regular;
color: #59aa29;
color: #ffbb00;
}
#log a:hover {
@ -482,7 +482,7 @@ input[type="number"]::-webkit-inner-spin-button {
float: left;
height: calc(100% - 150px);
width: 200px;
border-right: 4px solid #59aa29;
border-right: 4px solid #ffbb00;
background-color: #2e2e2e;
transition: all 0.2s;
@ -551,14 +551,16 @@ input[type="number"]::-webkit-inner-spin-button {
}
#tabs li.active a {
background-color: #59aa29;
color: #fff;
background-color: #ffbb00;
color: #000;
transition: none;
text-shadow: 0px 1px rgba(255, 255, 255, 0.45);
}
#tabs li.active a:hover {
cursor: default;
background-color: #59aa29;
background-color: #ffbb00;
}
.tabicon {
@ -911,7 +913,7 @@ li.active .ic_mission {
.data-loading {
width: 100%;
height: 100%;
background-image: url('../images/loading-bars.svg');
background-image: url('../images/loading-spin.svg');
background-repeat: no-repeat;
background-position: center 45%;
}
@ -938,7 +940,7 @@ dialog {
/* Tab Title */
.tab_title {
border-bottom: 1px solid #59aa29;
border-bottom: 1px solid #ffbb00;
font-size: 20px;
line-height: 24px;
height: 30px;
@ -987,14 +989,14 @@ dialog {
margin-top: 0px;
margin-bottom: 0px;
margin-right: 20px;
background-color: #59aa29;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;
border: 1px solid #dba718;
color: #000;
float: right;
font-family: 'open_sansbold', Arial;
font-size: 12px;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
display: block;
cursor: pointer;
transition: all ease 0.2s;
@ -1005,12 +1007,12 @@ dialog {
}
.content_toolbar .btn a:hover {
background-color: #6ac435;
background-color: #ffcc3e;
transition: all ease 0.2s;
}
.content_toolbar .btn a:active {
background-color: #4d9324;
background-color: #ffbb00;
transition: all ease 0.0s;
box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
}
@ -1136,7 +1138,7 @@ dialog {
}
.gui_note {
background: #ffffdd;
background: #fff6de;
}
.gui_warning .gui_box_titlebar {
@ -1150,7 +1152,7 @@ dialog {
}
.gui_note .gui_box_titlebar {
background-color: #cccc00;
background-color: #ffbb00;
background-image: linear-gradient(-45deg, rgba(255, 255, 255, .3) 10%, transparent 10%, transparent 20%,
rgba(255, 255, 255, .3) 20%, rgba(255, 255, 255, .3) 30%, transparent 30%, transparent 40%,
rgba(255, 255, 255, .3) 40%, rgba(255, 255, 255, .3) 50%, transparent 50%, transparent 60%,
@ -1206,10 +1208,10 @@ dialog {
margin-top: 9px;
margin-bottom: 0px;
margin-right: 20px;
background-color: #59aa29;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;
border: 1px solid #dba718;
color: #000;
float: right;
font-family: 'open_sansbold', Arial;
font-size: 12px;
@ -1224,7 +1226,7 @@ dialog {
}
.fixed_band .save_btn a:hover {
background-color: #6ac435;
background-color: #ffcc3f;
transition: all ease 0.2s;
}
@ -1240,10 +1242,10 @@ dialog {
.default_btn a {
padding: 5px 0px 5px 0px;
text-align: center;
background-color: #fff;
background-color: #ffbb00;
border-radius: 4px;
border: 1px solid #59aa29;
color: #59aa29;
border: 1px solid #dba718;
color: #000;
font-family: 'open_sanssemibold', Arial;
font-size: 12px;
line-height: 13px;
@ -1252,17 +1254,23 @@ dialog {
text-decoration:none;
}
.default_btn a.disabled {
background-color: #f1f1f1;
border: 1px solid #ddd;
color: #ccc;
}
.default_btn a:hover {
background-color: #6ac435;
color: #fff;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
background-color: #ffcc3f;
color: #000;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
transition: all ease 0.2s;
text-decoration:none;
}
.default_btn a:active {
background-color: #4d9324;
background-color: #ffcc3f;
transition: all ease 0.0s;
box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
}
@ -1292,10 +1300,10 @@ dialog {
}
.small a:hover {
background-color: #6ac435;
color: #fff;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
border: 1px solid #59aa29;
background-color: #ffbb00;
color: #000;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
border: 1px solid #ffbb00;
transition: all ease 0.2s;
}
@ -1306,18 +1314,18 @@ dialog {
}
.green a {
background-color: #59aa29;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
color: #fff;
border: 1px solid #59aa29;
background-color: #ffbb00;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
color: #000;
border: 1px solid #dba718;
transition: all ease 0.2s;
}
.green a:hover {
background-color: #6ac435;
border: 1px solid #4d9324;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
color: #fff;
background-color: #ffcc3f;
border: 1px solid #dba718;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
color: #000;
transition: all ease 0.2s;
}
@ -1356,7 +1364,7 @@ dialog {
}
.gps_true {
background-color: #59aa29;
background-color: #ffbb00;
padding: 1px 7px 2px 7px;
border-radius: 3px;
color: #FFFFFF;
@ -1392,8 +1400,8 @@ dialog {
}
.connect_b a.connect {
background-color: #56ac1d;
border: 1px solid #5bbb1b;
background-color: #ffbb00;
border: 1px solid #dba718;
background-image: url(images/icons/cf_icon_usb2_white.svg);
background-repeat: no-repeat;
background-size: 44px;
@ -1402,7 +1410,7 @@ dialog {
}
.connect_b a.connect:hover {
background-color: #68c02e;
background-color: #ffcc3f;
}
.connect_b a.connect.active {
@ -1478,7 +1486,7 @@ dialog {
margin-top: 20px;
width:125px;
float: right;
margin-right: 20px;
margin-right: 10px;
line-height: 12px;
height: 33px;
border-radius: 5px;
@ -1516,7 +1524,7 @@ dialog {
.dataflash-free_global {
background-color: #59AA29;
background-color: #ffbb00;
border-radius: 4px;
}
@ -1566,6 +1574,120 @@ dialog {
}
/* Battery element styling*/
#quad-status_wrapper {
display:none;
color: white;
font-size: 10px;
margin-top: 20px;
width: 90px;
float: right;
margin-right: 20px;
line-height: 12px;
height: 67px;
border-radius: 5px;
border: 1px solid #272727;
box-shadow: 0px 1px 0px rgba(92, 92, 92, 0.5);
background-color: #434343;
background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.55));
text-shadow: 0px 1px rgba(0, 0, 0, 1.0);
}
.quad-status-contents {
display: none;
margin-top: 10px;
margin-left: 14px;
height: 10px;
width: 30px;
/* width: 30px; */
}
.battery-legend {
display: inline;
position: relative;
top: -2px;
margin-top: 0px;
left: 0;
right: 0;
width: 40px;
text-align: left;
color: silver;
margin-left: -8px;
}
.quad-status-contents progress::-webkit-progress-bar {
height: 12px;
background-color: #eee;
}
.quad-status-contents progress::-webkit-progress-value {
background-color: #bcf;
}
.battery-status {
height: 11px;
position: relative;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.20);
border-radius: 0px;
background-color: #ffbb00;
/* border-radius: 4px; */
margin-top: 0px;
}
.battery-icon {
background-image: url(images/icons/cf_icon_bat_grey.svg);
background-size: contain;
background-position: center;
display: inline-block;
height: 30px;
width: 60px;
transition: none;
margin-top: 4px;
background-repeat: no-repeat;
}
.armedicon,
.failsafeicon,
.linkicon {
float: left;
margin-left: 8px;
margin-right: 2px;
margin-top: 6px;
display: block;
height: 18px;
width: 18px;
opacity: 0.8;
background-size: contain;
background-position: center;
transition: none;
}
.armedicon {
background-image: url(images/icons/cf_icon_armed_grey.svg);
}
.failsafeicon {
background-image: url(images/icons/cf_icon_failsafe_grey.svg);
}
.linkicon {
background-image: url(images/icons/cf_icon_link_grey.svg);
}
.bottomStatusIcons {
background-color: #272727;
height: 31px;
margin-top: 2px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px;
}
@media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
.content_wrapper {
@ -1679,4 +1801,4 @@ input {
overflow-y: auto;
}
}
}

View file

@ -132,7 +132,7 @@
</div>
<div class="header-wrapper">
<div id="dataflash_wrapper_global">
<div class="noflash_global" align="center">No dataflash <br>chip found</div>
<div class="noflash_global" align="center">No dataflash <br>chip found</div>
<ul class="dataflash-contents_global">
<li class="dataflash-free_global">
<div class="legend">Dataflash: free space</div>
@ -172,6 +172,19 @@
</li>
</ul>
</div>
<div id="quad-status_wrapper">
<div class="battery-icon">
<div class="quad-status-contents">
<div class="battery-status"></div>
</div>
</div>
<div class="battery-legend">Battery voltage</div>
<div class="bottomStatusIcons">
<div class="armedicon cf_tip" i18n_title="mainHelpArmed"></div>
<div class="failsafeicon cf_tip" i18n_title="mainHelpFailsafe"></div>
<div class="linkicon cf_tip" i18n_title="mainHelpLink"></div>
</div>
</div>
</div>
</div>
<div class="clear-both"></div>

42
main.js
View file

@ -1,13 +1,5 @@
'use strict';
// Google Analytics
var googleAnalyticsService = analytics.getService('ice_cream_app');
var googleAnalytics = googleAnalyticsService.getTracker(atob("VUEtNTI4MjA5MjAtMQ=="));
var googleAnalyticsConfig = false;
googleAnalyticsService.getConfig().addCallback(function (config) {
googleAnalyticsConfig = config;
});
$(document).ready(function () {
// translate to user-selected language
localize();
@ -36,7 +28,7 @@ $(document).ready(function () {
}
// check release time to inform people in case they are running old release
if (CONFIGURATOR.releaseDate > (new Date().getTime() - (86400000 * 60))) { // 1 day = 86400000 miliseconds, * 60 = 2 month window
if (CONFIGURATOR.releaseDate > (new Date().getTime() - (86400000 * 91))) { // 1 day = 86400000 miliseconds, * 91 = 3 month window
console.log('Application version is valid for another: ' + Math.round((CONFIGURATOR.releaseDate - (new Date().getTime() - (86400000 * 60))) / 86400000) + ' days');
} else {
console.log('Application version expired');
@ -54,11 +46,6 @@ $(document).ready(function () {
// it would seem the webgl "enabling" through advanced settings will be ignored in the future
// and webgl will be supported if gpu supports it by default (canary 40.0.2175.0), keep an eye on this one
var canvas = document.createElement('canvas');
if (window.WebGLRenderingContext && (canvas.getContext('webgl') || canvas.getContext('experimental-webgl'))) {
googleAnalytics.sendEvent('Capability', 'WebGL', 'true');
} else {
googleAnalytics.sendEvent('Capability', 'WebGL', 'false');
}
// log library versions in console to make version tracking easier
console.log('Libraries: jQuery - ' + $.fn.jquery + ', d3 - ' + d3.version + ', three.js - ' + THREE.REVISION);
@ -194,8 +181,6 @@ $(document).ready(function () {
el.after('<div id="options-window"></div>');
$('div#options-window').load('./tabs/options.html', function () {
googleAnalytics.sendAppView('Options');
// translate to user-selected language
localize();
@ -208,21 +193,17 @@ $(document).ready(function () {
$('div.notifications input').change(function () {
var check = $(this).is(':checked');
googleAnalytics.sendEvent('Settings', 'Notifications', check);
chrome.storage.local.set({'update_notify': check});
});
// if tracking is enabled, check the statistics checkbox
if (googleAnalyticsConfig.isTrackingPermitted()) {
$('div.statistics input').prop('checked', true);
}
$('div.statistics input').change(function () {
var check = $(this).is(':checked');
googleAnalytics.sendEvent('Settings', 'GoogleAnalytics', check);
googleAnalyticsConfig.setTrackingPermitted(check);
});
//if (googleAnalyticsConfig.isTrackingPermitted()) {
// $('div.statistics input').prop('checked', false);
//}
//$('div.statistics input').change(function () {
// var check = $(this).is(':checked');
//});
function close_and_cleanup(e) {
if (e.type == 'click' && !$.contains($('div#options-window')[0], e.target) || e.type == 'keyup' && e.keyCode == 27) {
@ -357,13 +338,6 @@ $(document).ready(function () {
});
});
function catch_startup_time(startTime) {
var endTime = new Date().getTime(),
timeSpent = endTime - startTime;
googleAnalytics.sendTiming('Load Times', 'Application Startup', timeSpent);
}
function microtime() {
var now = new Date().getTime() / 1000;
@ -416,4 +390,4 @@ function updateActivatedTab() {
var activeTab = $('#tabs > ul li.active');
activeTab.removeClass('active');
$('a', activeTab).trigger('click');
}
}

View file

@ -1,11 +1,11 @@
{
"manifest_version": 2,
"minimum_chrome_version": "38",
"version": "1.2.1",
"version": "1.0",
"author": "Hydra",
"name": "Cleanflight - Configurator",
"short_name": "cleanflight",
"description": "Crossplatform configuration tool for Cleanflight flight control system",
"name": "Betaflight - Configurator",
"short_name": "Betaflight",
"description": "Crossplatform configuration tool for Betaflight flight control system",
"offline_enabled": true,
@ -23,12 +23,10 @@
},
"permissions": [
"https://www.google-analytics.com/",
"https://maps.googleapis.com/*",
"https://*.github.com/",
"https://*.githubusercontent.com/",
"http://*.baseflight.net/",
"http://*.cleanflight.com/",
"https://*.amazonaws.com/",
"serial",
"usb",
@ -44,6 +42,6 @@
],
"icons": {
"128": "images/icon_128.png"
"128": "images/bf_icon_128.png"
}
}

View file

@ -1,22 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2014. All rights reserved. Used with permission for Baseflight Configurator -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd" [
<!ENTITY st0 "fill:#BDBCBC;">
]>
<svg version="1.1" baseProfile="basic"
id="custom-mix" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="43.83px" height="95px"
viewBox="0 0 43.83 95" xml:space="preserve">
<path id="CustomSymbol" style="&st0;" d="M2.66,16.33C0.89,13.46,0,10.94,0,8.75c0-1.61,0.43-2.97,1.29-4.06
s1.99-1.99,3.4-2.69s3.01-1.21,4.8-1.52S13.13,0,15,0c3.59,0,7.12,0.47,10.59,1.41s6.54,2.32,9.22,4.14
c2.68,1.82,4.86,4.1,6.52,6.84c1.67,2.73,2.5,5.93,2.5,9.57c0,2.4-0.38,4.52-1.13,6.37c-0.76,1.85-1.76,3.54-3.01,5.08
c-1.25,1.54-2.71,2.97-4.38,4.3c-1.67,1.33-3.41,2.64-5.24,3.94c-1.56,1.09-3.07,2.15-4.53,3.16c-1.46,1.02-2.76,2.07-3.91,3.16
c-1.15,1.09-2.07,2.28-2.77,3.55s-1.05,2.72-1.05,4.34c0,1.51,0.35,3.09,1.05,4.73s1.81,3.56,3.32,5.74
c-1.2,0.83-2.38,1.48-3.56,1.95s-2.31,0.7-3.4,0.7c-1.51,0-2.84-0.26-3.98-0.78c-1.15-0.52-2.11-1.22-2.89-2.11
c-0.78-0.88-1.38-1.93-1.8-3.13c-0.42-1.2-0.63-2.47-0.63-3.83c0-2.24,0.47-4.31,1.41-6.21c0.94-1.9,2.15-3.67,3.63-5.31
s3.18-3.18,5.08-4.61c1.9-1.43,3.81-2.82,5.74-4.18c1.77-1.25,3.5-2.49,5.19-3.71c1.69-1.22,3.19-2.47,4.49-3.75s2.34-2.6,3.13-3.98
c0.78-1.38,1.17-2.88,1.17-4.49c0-1.93-0.47-3.58-1.41-4.96c-0.94-1.38-2.17-2.5-3.71-3.36c-1.54-0.86-3.31-1.48-5.31-1.88
c-2.01-0.39-4.1-0.59-6.29-0.59C12.5,12.11,7.03,13.52,2.66,16.33z M22.81,86.72c0,2.81-0.78,4.9-2.34,6.25
c-1.56,1.35-3.83,2.03-6.8,2.03c-2.4,0-4.24-0.76-5.55-2.27c-1.3-1.51-1.95-3.52-1.95-6.02c0-2.97,0.81-5.1,2.42-6.41
c1.62-1.3,3.85-1.95,6.72-1.95c2.5,0,4.38,0.73,5.63,2.19C22.19,82.01,22.81,84.06,22.81,86.72z"/>
</svg>
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="-84 66 200 200" style="enable-background:new -84 66 200 200;" xml:space="preserve">
<style type="text/css">
.st0{opacity:0.3;}
.st1{fill:none;stroke:#1A171B;stroke-linecap:round;stroke-miterlimit:10;}
.st2{fill:none;stroke:#1A171B;stroke-linecap:round;stroke-miterlimit:10;stroke-dasharray:2.9947,2.9947;}
.st3{fill:#BABABA;}
.st4{fill:#FFFFFF;}
</style>
<g id="surface11" class="st0">
<g>
<g>
<polyline class="st1" points="12.4,186.6 11.3,185.5 10.3,186.6 "/>
<path class="st2" d="M8.1,188.7l-46.9,46.9c-5.5,5.5-14.3,5.5-19.8,0c-5.5-5.5-5.5-14.3,0-19.8l48-48"/>
<polyline class="st1" points="-9.5,166.8 -8.5,165.7 -9.5,164.6 "/>
<path class="st2" d="M-11.7,162.5l-46.9-46.9c-5.5-5.5-5.5-14.3,0-19.8c5.5-5.5,14.3-5.5,19.8,0l48,48"/>
<polyline class="st1" points="10.3,144.8 11.3,145.9 12.4,144.8 "/>
<path class="st2" d="M14.5,142.7l46.9-46.9c5.5-5.5,14.3-5.5,19.8,0c5.5,5.5,5.5,14.3,0,19.8l-48,48"/>
<polyline class="st1" points="32.2,164.6 31.1,165.7 32.2,166.8 "/>
<path class="st2" d="M34.3,168.9l46.9,46.9c5.5,5.5,5.5,14.3,0,19.8c-2.7,2.7-6.3,4.1-9.9,4.1s-7.2-1.4-9.9-4.1l-48-48"/>
</g>
</g>
<g>
</g>
</g>
<path class="st3" d="M53.6,181.3h-84.5c-4.1,0-7.5-3.4-7.5-7.5v-17c0-4.1,3.4-7.5,7.5-7.5h84.5c4.1,0,7.5,3.4,7.5,7.5v17
C61.1,177.9,57.7,181.3,53.6,181.3z"/>
<g>
<path class="st4" d="M-21.5,169.7c-0.4,0.2-1.3,0.4-2.5,0.4c-2.7,0-4.7-1.7-4.7-4.8c0-3,2-5,4.9-5c1.2,0,1.9,0.3,2.2,0.4l-0.3,1
c-0.5-0.2-1.1-0.4-1.9-0.4c-2.2,0-3.7,1.4-3.7,3.9c0,2.3,1.3,3.8,3.6,3.8c0.7,0,1.5-0.2,2-0.4L-21.5,169.7z"/>
<path class="st4" d="M-14.5,168.1c0,0.7,0,1.3,0.1,1.8h-1.1l-0.1-1.1h0c-0.3,0.5-1,1.3-2.2,1.3c-1.1,0-2.3-0.6-2.3-3v-4h1.2v3.8
c0,1.3,0.4,2.2,1.5,2.2c0.8,0,1.4-0.6,1.6-1.1c0.1-0.2,0.1-0.4,0.1-0.6v-4.2h1.2V168.1z"/>
<path class="st4" d="M-12.6,168.7c0.4,0.2,1,0.5,1.6,0.5c0.9,0,1.3-0.4,1.3-1c0-0.6-0.3-0.9-1.3-1.2c-1.2-0.4-1.8-1.1-1.8-1.9
c0-1.1,0.9-2,2.3-2c0.7,0,1.3,0.2,1.7,0.4l-0.3,0.9c-0.3-0.2-0.8-0.4-1.4-0.4c-0.7,0-1.1,0.4-1.1,0.9c0,0.6,0.4,0.8,1.3,1.1
c1.2,0.4,1.8,1,1.8,2c0,1.2-0.9,2-2.5,2c-0.7,0-1.4-0.2-1.9-0.5L-12.6,168.7z"/>
<path class="st4" d="M-5.4,161.3v1.9h1.8v0.9h-1.8v3.7c0,0.8,0.2,1.3,0.9,1.3c0.3,0,0.6,0,0.7-0.1l0.1,0.9
c-0.2,0.1-0.6,0.2-1.1,0.2c-0.6,0-1-0.2-1.3-0.5c-0.4-0.4-0.5-1-0.5-1.8v-3.7h-1.1v-0.9h1.1v-1.6L-5.4,161.3z"/>
<path class="st4" d="M3.8,166.5c0,2.5-1.7,3.6-3.4,3.6c-1.8,0-3.2-1.3-3.2-3.5c0-2.3,1.5-3.6,3.4-3.6C2.5,163,3.8,164.5,3.8,166.5z
M-1.6,166.6c0,1.5,0.9,2.6,2.1,2.6c1.2,0,2.1-1.1,2.1-2.6c0-1.1-0.6-2.6-2-2.6S-1.6,165.3-1.6,166.6z"/>
<path class="st4" d="M5.3,165c0-0.7,0-1.3-0.1-1.8h1.1l0.1,1.1h0c0.4-0.6,1-1.2,2.1-1.2c0.9,0,1.6,0.6,1.9,1.4h0
c0.2-0.4,0.5-0.7,0.8-0.9c0.4-0.3,0.9-0.5,1.5-0.5c0.9,0,2.2,0.6,2.2,2.9v4h-1.2v-3.8c0-1.3-0.5-2.1-1.5-2.1
c-0.7,0-1.2,0.5-1.5,1.1c-0.1,0.2-0.1,0.4-0.1,0.6v4.2H9.6v-4.1c0-1.1-0.5-1.9-1.4-1.9c-0.8,0-1.3,0.6-1.5,1.2
c-0.1,0.2-0.1,0.4-0.1,0.6v4.1H5.3V165z"/>
<path class="st4" d="M28,165.8c-0.1-1.3-0.2-2.9-0.1-4.1h0c-0.3,1.1-0.7,2.3-1.2,3.6l-1.7,4.6H24l-1.5-4.5
c-0.4-1.3-0.8-2.5-1.1-3.7h0c0,1.2-0.1,2.8-0.2,4.2l-0.3,4h-1.2l0.7-9.4H22l1.6,4.6c0.4,1.2,0.7,2.2,1,3.2h0c0.2-1,0.6-2,1-3.2
l1.7-4.6h1.6l0.6,9.4h-1.2L28,165.8z"/>
<path class="st4" d="M32.8,161.3c0,0.4-0.3,0.8-0.8,0.8c-0.4,0-0.7-0.3-0.7-0.8c0-0.4,0.3-0.8,0.8-0.8
C32.5,160.5,32.8,160.9,32.8,161.3z M31.4,170v-6.8h1.2v6.8H31.4z"/>
<path class="st4" d="M35.2,163.2l1,1.5c0.3,0.4,0.5,0.7,0.7,1.1h0c0.2-0.4,0.4-0.8,0.7-1.1l1-1.4h1.3l-2.3,3.3L40,170h-1.4l-1-1.5
c-0.3-0.4-0.5-0.8-0.7-1.2h0c-0.2,0.4-0.5,0.8-0.7,1.2l-1,1.5h-1.4l2.4-3.5l-2.3-3.3H35.2z"/>
<path class="st4" d="M41.6,166.8c0,1.7,1.1,2.4,2.3,2.4c0.9,0,1.4-0.2,1.9-0.3l0.2,0.9c-0.4,0.2-1.2,0.4-2.3,0.4
c-2.1,0-3.3-1.4-3.3-3.4s1.2-3.7,3.2-3.7c2.2,0,2.8,1.9,2.8,3.2c0,0.3,0,0.4,0,0.6H41.6z M45.2,165.9c0-0.8-0.3-2-1.7-2
c-1.2,0-1.8,1.1-1.9,2H45.2z"/>
<path class="st4" d="M47.9,165.3c0-0.8,0-1.5-0.1-2.1H49l0,1.3h0.1c0.3-0.9,1-1.5,1.9-1.5c0.1,0,0.2,0,0.3,0v1.2
c-0.1,0-0.3,0-0.4,0c-0.9,0-1.5,0.7-1.7,1.6c0,0.2-0.1,0.4-0.1,0.6v3.6h-1.2V165.3z"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Before After
Before After

View file

@ -28,27 +28,27 @@
</defs>
<g id="surface21">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 100 40 L 100 160 M 151.960938 70 L 48.039062 130 M 151.960938 130 L 48.039062 70 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 124 40 C 124 53.253906 113.253906 64 100 64 C 86.746094 64 76 53.253906 76 40 C 76 26.746094 86.746094 16 100 16 C 113.253906 16 124 26.746094 124 40 M 83.03125 23.03125 L 83.03125 8.632812 M 83.03125 23.03125 L 97.429688 24.757812 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 124 40 C 124 53.253906 113.253906 64 100 64 C 86.746094 64 76 53.253906 76 40 C 76 26.746094 86.746094 16 100 16 C 113.253906 16 124 26.746094 124 40 M 83.03125 23.03125 L 83.03125 8.632812 M 83.03125 23.03125 L 97.429688 24.757812 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="94" y="46"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.960938 70 C 175.960938 83.253906 165.214844 94 151.960938 94 C 138.707031 94 127.960938 83.253906 127.960938 70 C 127.960938 56.746094 138.707031 46 151.960938 46 C 165.214844 46 175.960938 56.746094 175.960938 70 M 168.933594 53.03125 L 168.933594 38.632812 M 168.933594 53.03125 L 154.535156 54.757812 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.960938 70 C 175.960938 83.253906 165.214844 94 151.960938 94 C 138.707031 94 127.960938 83.253906 127.960938 70 C 127.960938 56.746094 138.707031 46 151.960938 46 C 165.214844 46 175.960938 56.746094 175.960938 70 M 168.933594 53.03125 L 168.933594 38.632812 M 168.933594 53.03125 L 154.535156 54.757812 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="145.960938" y="76"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.960938 130 C 175.960938 143.253906 165.214844 154 151.960938 154 C 138.707031 154 127.960938 143.253906 127.960938 130 C 127.960938 116.746094 138.707031 106 151.960938 106 C 165.214844 106 175.960938 116.746094 175.960938 130 M 168.933594 146.96875 L 168.933594 161.367188 M 168.933594 146.96875 L 154.535156 145.242188 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 175.960938 130 C 175.960938 143.253906 165.214844 154 151.960938 154 C 138.707031 154 127.960938 143.253906 127.960938 130 C 127.960938 116.746094 138.707031 106 151.960938 106 C 165.214844 106 175.960938 116.746094 175.960938 130 M 168.933594 146.96875 L 168.933594 161.367188 M 168.933594 146.96875 L 154.535156 145.242188 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="145.960938" y="136"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 124 160 C 124 173.253906 113.253906 184 100 184 C 86.746094 184 76 173.253906 76 160 C 76 146.746094 86.746094 136 100 136 C 113.253906 136 124 146.746094 124 160 M 83.03125 176.96875 L 83.03125 191.367188 M 83.03125 176.96875 L 97.429688 175.242188 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 124 160 C 124 173.253906 113.253906 184 100 184 C 86.746094 184 76 173.253906 76 160 C 76 146.746094 86.746094 136 100 136 C 113.253906 136 124 146.746094 124 160 M 83.03125 176.96875 L 83.03125 191.367188 M 83.03125 176.96875 L 97.429688 175.242188 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="94" y="166"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.039062 130 C 72.039062 143.253906 61.292969 154 48.039062 154 C 34.785156 154 24.039062 143.253906 24.039062 130 C 24.039062 116.746094 34.785156 106 48.039062 106 C 61.292969 106 72.039062 116.746094 72.039062 130 M 31.066406 146.96875 L 32.792969 132.570312 M 31.066406 146.96875 L 16.667969 146.96875 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.039062 130 C 72.039062 143.253906 61.292969 154 48.039062 154 C 34.785156 154 24.039062 143.253906 24.039062 130 C 24.039062 116.746094 34.785156 106 48.039062 106 C 61.292969 106 72.039062 116.746094 72.039062 130 M 31.066406 146.96875 L 32.792969 132.570312 M 31.066406 146.96875 L 16.667969 146.96875 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-5" x="42.039062" y="136"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.039062 70 C 72.039062 83.253906 61.292969 94 48.039062 94 C 34.785156 94 24.039062 83.253906 24.039062 70 C 24.039062 56.746094 34.785156 46 48.039062 46 C 61.292969 46 72.039062 56.746094 72.039062 70 M 31.066406 53.03125 L 32.792969 67.429688 M 31.066406 53.03125 L 16.667969 53.03125 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 72.039062 70 C 72.039062 83.253906 61.292969 94 48.039062 94 C 34.785156 94 24.039062 83.253906 24.039062 70 C 24.039062 56.746094 34.785156 46 48.039062 46 C 61.292969 46 72.039062 56.746094 72.039062 70 M 31.066406 53.03125 L 32.792969 67.429688 M 31.066406 53.03125 L 16.667969 53.03125 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-6" x="42.039062" y="76"/>
</g>

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

View file

@ -28,27 +28,27 @@
</defs>
<g id="surface26">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 130 48.039062 L 70 151.960938 M 160 100 L 40 100 M 130 151.960938 L 70 48.039062 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 154 48.039062 C 154 61.292969 143.253906 72.039062 130 72.039062 C 116.746094 72.039062 106 61.292969 106 48.039062 C 106 34.785156 116.746094 24.039062 130 24.039062 C 143.253906 24.039062 154 34.785156 154 48.039062 M 146.96875 31.066406 L 145.242188 45.464844 M 146.96875 31.066406 L 161.367188 31.066406 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 154 48.039062 C 154 61.292969 143.253906 72.039062 130 72.039062 C 116.746094 72.039062 106 61.292969 106 48.039062 C 106 34.785156 116.746094 24.039062 130 24.039062 C 143.253906 24.039062 154 34.785156 154 48.039062 M 146.96875 31.066406 L 145.242188 45.464844 M 146.96875 31.066406 L 161.367188 31.066406 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="124" y="54.039062"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 184 100 C 184 113.253906 173.253906 124 160 124 C 146.746094 124 136 113.253906 136 100 C 136 86.746094 146.746094 76 160 76 C 173.253906 76 184 86.746094 184 100 M 176.96875 116.96875 L 175.242188 102.570312 M 176.96875 116.96875 L 191.367188 116.96875 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 184 100 C 184 113.253906 173.253906 124 160 124 C 146.746094 124 136 113.253906 136 100 C 136 86.746094 146.746094 76 160 76 C 173.253906 76 184 86.746094 184 100 M 176.96875 116.96875 L 175.242188 102.570312 M 176.96875 116.96875 L 191.367188 116.96875 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="154" y="106"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 154 151.960938 C 154 165.214844 143.253906 175.960938 130 175.960938 C 116.746094 175.960938 106 165.214844 106 151.960938 C 106 138.707031 116.746094 127.960938 130 127.960938 C 143.253906 127.960938 154 138.707031 154 151.960938 M 146.96875 168.933594 L 146.96875 183.332031 M 146.96875 168.933594 L 132.570312 167.207031 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 154 151.960938 C 154 165.214844 143.253906 175.960938 130 175.960938 C 116.746094 175.960938 106 165.214844 106 151.960938 C 106 138.707031 116.746094 127.960938 130 127.960938 C 143.253906 127.960938 154 138.707031 154 151.960938 M 146.96875 168.933594 L 146.96875 183.332031 M 146.96875 168.933594 L 132.570312 167.207031 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="124" y="157.960938"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 94 151.960938 C 94 165.214844 83.253906 175.960938 70 175.960938 C 56.746094 175.960938 46 165.214844 46 151.960938 C 46 138.707031 56.746094 127.960938 70 127.960938 C 83.253906 127.960938 94 138.707031 94 151.960938 M 53.03125 168.933594 L 53.03125 183.332031 M 53.03125 168.933594 L 67.429688 167.207031 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 94 151.960938 C 94 165.214844 83.253906 175.960938 70 175.960938 C 56.746094 175.960938 46 165.214844 46 151.960938 C 46 138.707031 56.746094 127.960938 70 127.960938 C 83.253906 127.960938 94 138.707031 94 151.960938 M 53.03125 168.933594 L 53.03125 183.332031 M 53.03125 168.933594 L 67.429688 167.207031 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="64" y="157.960938"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 64 100 C 64 113.253906 53.253906 124 40 124 C 26.746094 124 16 113.253906 16 100 C 16 86.746094 26.746094 76 40 76 C 53.253906 76 64 86.746094 64 100 M 23.03125 116.96875 L 24.757812 102.570312 M 23.03125 116.96875 L 8.632812 116.96875 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 64 100 C 64 113.253906 53.253906 124 40 124 C 26.746094 124 16 113.253906 16 100 C 16 86.746094 26.746094 76 40 76 C 53.253906 76 64 86.746094 64 100 M 23.03125 116.96875 L 24.757812 102.570312 M 23.03125 116.96875 L 8.632812 116.96875 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-5" x="34" y="106"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 94 48.039062 C 94 61.292969 83.253906 72.039062 70 72.039062 C 56.746094 72.039062 46 61.292969 46 48.039062 C 46 34.785156 56.746094 24.039062 70 24.039062 C 83.253906 24.039062 94 34.785156 94 48.039062 M 53.03125 31.066406 L 54.757812 45.464844 M 53.03125 31.066406 L 38.632812 31.066406 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 94 48.039062 C 94 61.292969 83.253906 72.039062 70 72.039062 C 56.746094 72.039062 46 61.292969 46 48.039062 C 46 34.785156 56.746094 24.039062 70 24.039062 C 83.253906 24.039062 94 34.785156 94 48.039062 M 53.03125 31.066406 L 54.757812 45.464844 M 53.03125 31.066406 L 38.632812 31.066406 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-6" x="64" y="54.039062"/>
</g>

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

View file

@ -34,35 +34,35 @@
</defs>
<g id="surface36">
<path style="fill:none;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 100 30 L 100 170 M 149.496094 50.503906 L 50.503906 149.496094 M 170 100 L 30 100 M 149.496094 149.496094 L 50.503906 50.503906 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 120 30 C 120 41.046875 111.046875 50 100 50 C 88.953125 50 80 41.046875 80 30 C 80 18.953125 88.953125 10 100 10 C 111.046875 10 120 18.953125 120 30 M 114.140625 15.859375 L 114.140625 3.859375 M 114.140625 15.859375 L 102.140625 17.300781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 120 30 C 120 41.046875 111.046875 50 100 50 C 88.953125 50 80 41.046875 80 30 C 80 18.953125 88.953125 10 100 10 C 111.046875 10 120 18.953125 120 30 M 114.140625 15.859375 L 114.140625 3.859375 M 114.140625 15.859375 L 102.140625 17.300781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="95" y="35"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 169.496094 50.503906 C 169.496094 61.546875 160.542969 70.503906 149.496094 70.503906 C 138.453125 70.503906 129.496094 61.546875 129.496094 50.503906 C 129.496094 39.457031 138.453125 30.503906 149.496094 30.503906 C 160.542969 30.503906 169.496094 39.457031 169.496094 50.503906 M 163.640625 36.359375 L 162.199219 48.359375 M 163.640625 36.359375 L 175.640625 36.359375 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 169.496094 50.503906 C 169.496094 61.546875 160.542969 70.503906 149.496094 70.503906 C 138.453125 70.503906 129.496094 61.546875 129.496094 50.503906 C 129.496094 39.457031 138.453125 30.503906 149.496094 30.503906 C 160.542969 30.503906 169.496094 39.457031 169.496094 50.503906 M 163.640625 36.359375 L 162.199219 48.359375 M 163.640625 36.359375 L 175.640625 36.359375 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="144.496094" y="55.503906"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 100 C 190 111.046875 181.046875 120 170 120 C 158.953125 120 150 111.046875 150 100 C 150 88.953125 158.953125 80 170 80 C 181.046875 80 190 88.953125 190 100 M 184.140625 114.140625 L 182.699219 102.140625 M 184.140625 114.140625 L 196.140625 114.140625 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 100 C 190 111.046875 181.046875 120 170 120 C 158.953125 120 150 111.046875 150 100 C 150 88.953125 158.953125 80 170 80 C 181.046875 80 190 88.953125 190 100 M 184.140625 114.140625 L 182.699219 102.140625 M 184.140625 114.140625 L 196.140625 114.140625 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="165" y="105"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 169.496094 149.496094 C 169.496094 160.542969 160.542969 169.496094 149.496094 169.496094 C 138.453125 169.496094 129.496094 160.542969 129.496094 149.496094 C 129.496094 138.453125 138.453125 129.496094 149.496094 129.496094 C 160.542969 129.496094 169.496094 138.453125 169.496094 149.496094 M 163.640625 163.640625 L 163.640625 175.640625 M 163.640625 163.640625 L 151.640625 162.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 169.496094 149.496094 C 169.496094 160.542969 160.542969 169.496094 149.496094 169.496094 C 138.453125 169.496094 129.496094 160.542969 129.496094 149.496094 C 129.496094 138.453125 138.453125 129.496094 149.496094 129.496094 C 160.542969 129.496094 169.496094 138.453125 169.496094 149.496094 M 163.640625 163.640625 L 163.640625 175.640625 M 163.640625 163.640625 L 151.640625 162.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="144.496094" y="154.496094"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 120 170 C 120 181.046875 111.046875 190 100 190 C 88.953125 190 80 181.046875 80 170 C 80 158.953125 88.953125 150 100 150 C 111.046875 150 120 158.953125 120 170 M 85.859375 184.140625 L 85.859375 196.140625 M 85.859375 184.140625 L 97.859375 182.699219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 120 170 C 120 181.046875 111.046875 190 100 190 C 88.953125 190 80 181.046875 80 170 C 80 158.953125 88.953125 150 100 150 C 111.046875 150 120 158.953125 120 170 M 85.859375 184.140625 L 85.859375 196.140625 M 85.859375 184.140625 L 97.859375 182.699219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-5" x="95" y="175"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 70.503906 149.496094 C 70.503906 160.542969 61.546875 169.496094 50.503906 169.496094 C 39.457031 169.496094 30.503906 160.542969 30.503906 149.496094 C 30.503906 138.453125 39.457031 129.496094 50.503906 129.496094 C 61.546875 129.496094 70.503906 138.453125 70.503906 149.496094 M 36.359375 163.640625 L 37.800781 151.640625 M 36.359375 163.640625 L 24.359375 163.640625 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 70.503906 149.496094 C 70.503906 160.542969 61.546875 169.496094 50.503906 169.496094 C 39.457031 169.496094 30.503906 160.542969 30.503906 149.496094 C 30.503906 138.453125 39.457031 129.496094 50.503906 129.496094 C 61.546875 129.496094 70.503906 138.453125 70.503906 149.496094 M 36.359375 163.640625 L 37.800781 151.640625 M 36.359375 163.640625 L 24.359375 163.640625 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-6" x="45.503906" y="154.496094"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50 100 C 50 111.046875 41.046875 120 30 120 C 18.953125 120 10 111.046875 10 100 C 10 88.953125 18.953125 80 30 80 C 41.046875 80 50 88.953125 50 100 M 15.859375 85.859375 L 17.300781 97.859375 M 15.859375 85.859375 L 3.859375 85.859375 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 50 100 C 50 111.046875 41.046875 120 30 120 C 18.953125 120 10 111.046875 10 100 C 10 88.953125 18.953125 80 30 80 C 41.046875 80 50 88.953125 50 100 M 15.859375 85.859375 L 17.300781 97.859375 M 15.859375 85.859375 L 3.859375 85.859375 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-7" x="25" y="105"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 70.503906 50.503906 C 70.503906 61.546875 61.546875 70.503906 50.503906 70.503906 C 39.457031 70.503906 30.503906 61.546875 30.503906 50.503906 C 30.503906 39.457031 39.457031 30.503906 50.503906 30.503906 C 61.546875 30.503906 70.503906 39.457031 70.503906 50.503906 M 36.359375 36.359375 L 36.359375 24.359375 M 36.359375 36.359375 L 48.359375 37.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 70.503906 50.503906 C 70.503906 61.546875 61.546875 70.503906 50.503906 70.503906 C 39.457031 70.503906 30.503906 61.546875 30.503906 50.503906 C 30.503906 39.457031 39.457031 30.503906 50.503906 30.503906 C 61.546875 30.503906 70.503906 39.457031 70.503906 50.503906 M 36.359375 36.359375 L 36.359375 24.359375 M 36.359375 36.359375 L 48.359375 37.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-8" x="45.503906" y="55.503906"/>
</g>

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

View file

@ -34,35 +34,35 @@
</defs>
<g id="surface31">
<path style="fill:none;stroke-width:20;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 126.789062 35.328125 L 73.210938 164.671875 M 164.671875 73.210938 L 35.328125 126.789062 M 164.671875 126.789062 L 35.328125 73.210938 M 126.789062 164.671875 L 73.210938 35.328125 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 146.789062 35.328125 C 146.789062 46.375 137.832031 55.328125 126.789062 55.328125 C 115.742188 55.328125 106.789062 46.375 106.789062 35.328125 C 106.789062 24.28125 115.742188 15.328125 126.789062 15.328125 C 137.832031 15.328125 146.789062 24.28125 146.789062 35.328125 M 140.929688 21.1875 L 139.488281 33.1875 M 140.929688 21.1875 L 152.929688 21.1875 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 146.789062 35.328125 C 146.789062 46.375 137.832031 55.328125 126.789062 55.328125 C 115.742188 55.328125 106.789062 46.375 106.789062 35.328125 C 106.789062 24.28125 115.742188 15.328125 126.789062 15.328125 C 137.832031 15.328125 146.789062 24.28125 146.789062 35.328125 M 140.929688 21.1875 L 139.488281 33.1875 M 140.929688 21.1875 L 152.929688 21.1875 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="121.789062" y="40.328125"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 184.671875 73.210938 C 184.671875 84.257812 175.71875 93.210938 164.671875 93.210938 C 153.625 93.210938 144.671875 84.257812 144.671875 73.210938 C 144.671875 62.167969 153.625 53.210938 164.671875 53.210938 C 175.71875 53.210938 184.671875 62.167969 184.671875 73.210938 M 178.8125 59.070312 L 178.8125 47.070312 M 178.8125 59.070312 L 166.8125 60.511719 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 184.671875 73.210938 C 184.671875 84.257812 175.71875 93.210938 164.671875 93.210938 C 153.625 93.210938 144.671875 84.257812 144.671875 73.210938 C 144.671875 62.167969 153.625 53.210938 164.671875 53.210938 C 175.71875 53.210938 184.671875 62.167969 184.671875 73.210938 M 178.8125 59.070312 L 178.8125 47.070312 M 178.8125 59.070312 L 166.8125 60.511719 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="159.671875" y="78.210938"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 184.671875 126.789062 C 184.671875 137.832031 175.71875 146.789062 164.671875 146.789062 C 153.625 146.789062 144.671875 137.832031 144.671875 126.789062 C 144.671875 115.742188 153.625 106.789062 164.671875 106.789062 C 175.71875 106.789062 184.671875 115.742188 184.671875 126.789062 M 178.8125 140.929688 L 178.8125 152.929688 M 178.8125 140.929688 L 166.8125 139.488281 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 184.671875 126.789062 C 184.671875 137.832031 175.71875 146.789062 164.671875 146.789062 C 153.625 146.789062 144.671875 137.832031 144.671875 126.789062 C 144.671875 115.742188 153.625 106.789062 164.671875 106.789062 C 175.71875 106.789062 184.671875 115.742188 184.671875 126.789062 M 178.8125 140.929688 L 178.8125 152.929688 M 178.8125 140.929688 L 166.8125 139.488281 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="159.671875" y="131.789062"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 146.789062 164.671875 C 146.789062 175.71875 137.832031 184.671875 126.789062 184.671875 C 115.742188 184.671875 106.789062 175.71875 106.789062 164.671875 C 106.789062 153.625 115.742188 144.671875 126.789062 144.671875 C 137.832031 144.671875 146.789062 153.625 146.789062 164.671875 M 140.929688 178.8125 L 139.488281 166.8125 M 140.929688 178.8125 L 152.929688 178.8125 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 146.789062 164.671875 C 146.789062 175.71875 137.832031 184.671875 126.789062 184.671875 C 115.742188 184.671875 106.789062 175.71875 106.789062 164.671875 C 106.789062 153.625 115.742188 144.671875 126.789062 144.671875 C 137.832031 144.671875 146.789062 153.625 146.789062 164.671875 M 140.929688 178.8125 L 139.488281 166.8125 M 140.929688 178.8125 L 152.929688 178.8125 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="121.789062" y="169.671875"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 93.210938 164.671875 C 93.210938 175.71875 84.257812 184.671875 73.210938 184.671875 C 62.167969 184.671875 53.210938 175.71875 53.210938 164.671875 C 53.210938 153.625 62.167969 144.671875 73.210938 144.671875 C 84.257812 144.671875 93.210938 153.625 93.210938 164.671875 M 59.070312 178.8125 L 60.511719 166.8125 M 59.070312 178.8125 L 47.070312 178.8125 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 93.210938 164.671875 C 93.210938 175.71875 84.257812 184.671875 73.210938 184.671875 C 62.167969 184.671875 53.210938 175.71875 53.210938 164.671875 C 53.210938 153.625 62.167969 144.671875 73.210938 144.671875 C 84.257812 144.671875 93.210938 153.625 93.210938 164.671875 M 59.070312 178.8125 L 60.511719 166.8125 M 59.070312 178.8125 L 47.070312 178.8125 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-5" x="68.210938" y="169.671875"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.328125 126.789062 C 55.328125 137.832031 46.375 146.789062 35.328125 146.789062 C 24.28125 146.789062 15.328125 137.832031 15.328125 126.789062 C 15.328125 115.742188 24.28125 106.789062 35.328125 106.789062 C 46.375 106.789062 55.328125 115.742188 55.328125 126.789062 M 21.1875 140.929688 L 21.1875 152.929688 M 21.1875 140.929688 L 33.1875 139.488281 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.328125 126.789062 C 55.328125 137.832031 46.375 146.789062 35.328125 146.789062 C 24.28125 146.789062 15.328125 137.832031 15.328125 126.789062 C 15.328125 115.742188 24.28125 106.789062 35.328125 106.789062 C 46.375 106.789062 55.328125 115.742188 55.328125 126.789062 M 21.1875 140.929688 L 21.1875 152.929688 M 21.1875 140.929688 L 33.1875 139.488281 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-6" x="30.328125" y="131.789062"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.328125 73.210938 C 55.328125 84.257812 46.375 93.210938 35.328125 93.210938 C 24.28125 93.210938 15.328125 84.257812 15.328125 73.210938 C 15.328125 62.167969 24.28125 53.210938 35.328125 53.210938 C 46.375 53.210938 55.328125 62.167969 55.328125 73.210938 M 21.1875 59.070312 L 21.1875 47.070312 M 21.1875 59.070312 L 33.1875 60.511719 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 55.328125 73.210938 C 55.328125 84.257812 46.375 93.210938 35.328125 93.210938 C 24.28125 93.210938 15.328125 84.257812 15.328125 73.210938 C 15.328125 62.167969 24.28125 53.210938 35.328125 53.210938 C 46.375 53.210938 55.328125 62.167969 55.328125 73.210938 M 21.1875 59.070312 L 21.1875 47.070312 M 21.1875 59.070312 L 33.1875 60.511719 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-7" x="30.328125" y="78.210938"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 93.210938 35.328125 C 93.210938 46.375 84.257812 55.328125 73.210938 55.328125 C 62.167969 55.328125 53.210938 46.375 53.210938 35.328125 C 53.210938 24.28125 62.167969 15.328125 73.210938 15.328125 C 84.257812 15.328125 93.210938 24.28125 93.210938 35.328125 M 59.070312 21.1875 L 60.511719 33.1875 M 59.070312 21.1875 L 47.070312 21.1875 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 93.210938 35.328125 C 93.210938 46.375 84.257812 55.328125 73.210938 55.328125 C 62.167969 55.328125 53.210938 46.375 53.210938 35.328125 C 53.210938 24.28125 62.167969 15.328125 73.210938 15.328125 C 84.257812 15.328125 93.210938 24.28125 93.210938 35.328125 M 59.070312 21.1875 L 60.511719 33.1875 M 59.070312 21.1875 L 47.070312 21.1875 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-8" x="68.210938" y="40.328125"/>
</g>

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -33,40 +33,40 @@
</g>
</defs>
<g id="surface61">
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,39.215686%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 170 C 198 185.464844 185.464844 198 170 198 C 154.535156 198 142 185.464844 142 170 C 142 154.535156 154.535156 142 170 142 C 185.464844 142 198 154.535156 198 170 M 189.800781 150.199219 L 187.785156 167 M 189.800781 150.199219 L 206.601562 150.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 170 C 198 185.464844 185.464844 198 170 198 C 154.535156 198 142 185.464844 142 170 C 142 154.535156 154.535156 142 170 142 C 185.464844 142 198 154.535156 198 170 M 189.800781 150.199219 L 187.785156 167 M 189.800781 150.199219 L 206.601562 150.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="171" y="191"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,39.215686%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 30 C 198 45.464844 185.464844 58 170 58 C 154.535156 58 142 45.464844 142 30 C 142 14.535156 154.535156 2 170 2 C 185.464844 2 198 14.535156 198 30 M 189.800781 49.800781 L 187.785156 33 M 189.800781 49.800781 L 206.601562 49.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 30 C 198 45.464844 185.464844 58 170 58 C 154.535156 58 142 45.464844 142 30 C 142 14.535156 154.535156 2 170 2 C 185.464844 2 198 14.535156 198 30 M 189.800781 49.800781 L 187.785156 33 M 189.800781 49.800781 L 206.601562 49.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="171" y="27"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,39.215686%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 58 170 C 58 185.464844 45.464844 198 30 198 C 14.535156 198 2 185.464844 2 170 C 2 154.535156 14.535156 142 30 142 C 45.464844 142 58 154.535156 58 170 M 10.199219 150.199219 L 12.214844 167 M 10.199219 150.199219 L -6.601562 150.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 58 170 C 58 185.464844 45.464844 198 30 198 C 14.535156 198 2 185.464844 2 170 C 2 154.535156 14.535156 142 30 142 C 45.464844 142 58 154.535156 58 170 M 10.199219 150.199219 L 12.214844 167 M 10.199219 150.199219 L -6.601562 150.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="13" y="191"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,39.215686%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 58 30 C 58 45.464844 45.464844 58 30 58 C 14.535156 58 2 45.464844 2 30 C 2 14.535156 14.535156 2 30 2 C 45.464844 2 58 14.535156 58 30 M 10.199219 49.800781 L 12.214844 33 M 10.199219 49.800781 L -6.601562 49.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 58 30 C 58 45.464844 45.464844 58 30 58 C 14.535156 58 2 45.464844 2 30 C 2 14.535156 14.535156 2 30 2 C 45.464844 2 58 14.535156 58 30 M 10.199219 49.800781 L 12.214844 33 M 10.199219 49.800781 L -6.601562 49.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="13" y="27"/>
</g>
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 50 50 L 150 150 M 50 150 L 150 50 "/>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.533333;" d="M 178 150 C 178 165.464844 165.464844 178 150 178 C 134.535156 178 122 165.464844 122 150 C 122 134.535156 134.535156 122 150 122 C 165.464844 122 178 134.535156 178 150 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 178 150 C 178 165.464844 165.464844 178 150 178 C 134.535156 178 122 165.464844 122 150 C 122 134.535156 134.535156 122 150 122 C 165.464844 122 178 134.535156 178 150 M 130.199219 169.800781 L 130.199219 186.601562 M 130.199219 169.800781 L 147 167.785156 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 178 150 C 178 165.464844 165.464844 178 150 178 C 134.535156 178 122 165.464844 122 150 C 122 134.535156 134.535156 122 150 122 C 165.464844 122 178 134.535156 178 150 M 130.199219 169.800781 L 130.199219 186.601562 M 130.199219 169.800781 L 147 167.785156 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-5" x="143" y="147"/>
</g>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.533333;" d="M 178 50 C 178 65.464844 165.464844 78 150 78 C 134.535156 78 122 65.464844 122 50 C 122 34.535156 134.535156 22 150 22 C 165.464844 22 178 34.535156 178 50 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 178 50 C 178 65.464844 165.464844 78 150 78 C 134.535156 78 122 65.464844 122 50 C 122 34.535156 134.535156 22 150 22 C 165.464844 22 178 34.535156 178 50 M 130.199219 30.199219 L 130.199219 13.398438 M 130.199219 30.199219 L 147 32.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 178 50 C 178 65.464844 165.464844 78 150 78 C 134.535156 78 122 65.464844 122 50 C 122 34.535156 134.535156 22 150 22 C 165.464844 22 178 34.535156 178 50 M 130.199219 30.199219 L 130.199219 13.398438 M 130.199219 30.199219 L 147 32.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-6" x="143" y="69"/>
</g>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.533333;" d="M 78 150 C 78 165.464844 65.464844 178 50 178 C 34.535156 178 22 165.464844 22 150 C 22 134.535156 34.535156 122 50 122 C 65.464844 122 78 134.535156 78 150 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 78 150 C 78 165.464844 65.464844 178 50 178 C 34.535156 178 22 165.464844 22 150 C 22 134.535156 34.535156 122 50 122 C 65.464844 122 78 134.535156 78 150 M 69.800781 169.800781 L 69.800781 186.601562 M 69.800781 169.800781 L 53 167.785156 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 78 150 C 78 165.464844 65.464844 178 50 178 C 34.535156 178 22 165.464844 22 150 C 22 134.535156 34.535156 122 50 122 C 65.464844 122 78 134.535156 78 150 M 69.800781 169.800781 L 69.800781 186.601562 M 69.800781 169.800781 L 53 167.785156 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-7" x="43" y="147"/>
</g>
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:0.533333;" d="M 78 50 C 78 65.464844 65.464844 78 50 78 C 34.535156 78 22 65.464844 22 50 C 22 34.535156 34.535156 22 50 22 C 65.464844 22 78 34.535156 78 50 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 78 50 C 78 65.464844 65.464844 78 50 78 C 34.535156 78 22 65.464844 22 50 C 22 34.535156 34.535156 22 50 22 C 65.464844 22 78 34.535156 78 50 M 69.800781 30.199219 L 69.800781 13.398438 M 69.800781 30.199219 L 53 32.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 78 50 C 78 65.464844 65.464844 78 50 78 C 34.535156 78 22 65.464844 22 50 C 22 34.535156 34.535156 22 50 22 C 65.464844 22 78 34.535156 78 50 M 69.800781 30.199219 L 69.800781 13.398438 M 69.800781 30.199219 L 53 32.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-8" x="43" y="69"/>
</g>

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

View file

@ -22,19 +22,19 @@
</defs>
<g id="surface16">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 40 100 L 160 100 M 100 40 L 100 160 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 160 C 128 175.464844 115.464844 188 100 188 C 84.535156 188 72 175.464844 72 160 C 72 144.535156 84.535156 132 100 132 C 115.464844 132 128 144.535156 128 160 M 80.199219 179.800781 L 80.199219 196.601562 M 80.199219 179.800781 L 97 177.785156 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 160 C 128 175.464844 115.464844 188 100 188 C 84.535156 188 72 175.464844 72 160 C 72 144.535156 84.535156 132 100 132 C 115.464844 132 128 144.535156 128 160 M 80.199219 179.800781 L 80.199219 196.601562 M 80.199219 179.800781 L 97 177.785156 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="93" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 100 C 188 115.464844 175.464844 128 160 128 C 144.535156 128 132 115.464844 132 100 C 132 84.535156 144.535156 72 160 72 C 175.464844 72 188 84.535156 188 100 M 179.800781 80.199219 L 177.785156 97 M 179.800781 80.199219 L 196.601562 80.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 100 C 188 115.464844 175.464844 128 160 128 C 144.535156 128 132 115.464844 132 100 C 132 84.535156 144.535156 72 160 72 C 175.464844 72 188 84.535156 188 100 M 179.800781 80.199219 L 177.785156 97 M 179.800781 80.199219 L 196.601562 80.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="153" y="107"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 40 C 128 55.464844 115.464844 68 100 68 C 84.535156 68 72 55.464844 72 40 C 72 24.535156 84.535156 12 100 12 C 115.464844 12 128 24.535156 128 40 M 119.800781 20.199219 L 119.800781 3.398438 M 119.800781 20.199219 L 103 22.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 40 C 128 55.464844 115.464844 68 100 68 C 84.535156 68 72 55.464844 72 40 C 72 24.535156 84.535156 12 100 12 C 115.464844 12 128 24.535156 128 40 M 119.800781 20.199219 L 119.800781 3.398438 M 119.800781 20.199219 L 103 22.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="93" y="47"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 100 C 68 115.464844 55.464844 128 40 128 C 24.535156 128 12 115.464844 12 100 C 12 84.535156 24.535156 72 40 72 C 55.464844 72 68 84.535156 68 100 M 20.199219 119.800781 L 22.214844 103 M 20.199219 119.800781 L 3.398438 119.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 100 C 68 115.464844 55.464844 128 40 128 C 24.535156 128 12 115.464844 12 100 C 12 84.535156 24.535156 72 40 72 C 55.464844 72 68 84.535156 68 100 M 20.199219 119.800781 L 22.214844 103 M 20.199219 119.800781 L 3.398438 119.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="33" y="107"/>
</g>

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before After
Before After

View file

@ -22,19 +22,19 @@
</defs>
<g id="surface11">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 40 40 L 160 160 M 40 160 L 160 40 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 160 C 188 175.464844 175.464844 188 160 188 C 144.535156 188 132 175.464844 132 160 C 132 144.535156 144.535156 132 160 132 C 175.464844 132 188 144.535156 188 160 M 179.800781 179.800781 L 177.785156 163 M 179.800781 179.800781 L 196.601562 179.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 160 C 188 175.464844 175.464844 188 160 188 C 144.535156 188 132 175.464844 132 160 C 132 144.535156 144.535156 132 160 132 C 175.464844 132 188 144.535156 188 160 M 179.800781 179.800781 L 177.785156 163 M 179.800781 179.800781 L 196.601562 179.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="153" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 179.800781 20.199219 L 177.785156 37 M 179.800781 20.199219 L 196.601562 20.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 179.800781 20.199219 L 177.785156 37 M 179.800781 20.199219 L 196.601562 20.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="153" y="47"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 160 C 68 175.464844 55.464844 188 40 188 C 24.535156 188 12 175.464844 12 160 C 12 144.535156 24.535156 132 40 132 C 55.464844 132 68 144.535156 68 160 M 20.199219 179.800781 L 22.214844 163 M 20.199219 179.800781 L 3.398438 179.800781 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 160 C 68 175.464844 55.464844 188 40 188 C 24.535156 188 12 175.464844 12 160 C 12 144.535156 24.535156 132 40 132 C 55.464844 132 68 144.535156 68 160 M 20.199219 179.800781 L 22.214844 163 M 20.199219 179.800781 L 3.398438 179.800781 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="33" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 20.199219 20.199219 L 22.214844 37 M 20.199219 20.199219 L 3.398438 20.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 20.199219 20.199219 L 22.214844 37 M 20.199219 20.199219 L 3.398438 20.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="33" y="47"/>
</g>

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before After
Before After

View file

@ -28,15 +28,15 @@
</defs>
<g id="surface6">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 40 40 L 160 40 M 100 40 L 100 160 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 160 C 128 175.464844 115.464844 188 100 188 C 84.535156 188 72 175.464844 72 160 C 72 144.535156 84.535156 132 100 132 C 115.464844 132 128 144.535156 128 160 M 80.199219 140.199219 L 80.199219 123.398438 M 80.199219 140.199219 L 97 142.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 128 160 C 128 175.464844 115.464844 188 100 188 C 84.535156 188 72 175.464844 72 160 C 72 144.535156 84.535156 132 100 132 C 115.464844 132 128 144.535156 128 160 M 80.199219 140.199219 L 80.199219 123.398438 M 80.199219 140.199219 L 97 142.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="93" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 140.199219 20.199219 L 140.199219 3.398438 M 140.199219 20.199219 L 157 22.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 140.199219 20.199219 L 140.199219 3.398438 M 140.199219 20.199219 L 157 22.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="153" y="47"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 59.800781 20.199219 L 57.785156 37 M 59.800781 20.199219 L 76.601562 20.199219 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 59.800781 20.199219 L 57.785156 37 M 59.800781 20.199219 L 76.601562 20.199219 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="33" y="47"/>
</g>

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8 KiB

Before After
Before After

View file

@ -22,19 +22,19 @@
</defs>
<g id="surface41">
<path style="fill:none;stroke-width:28;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(72.941176%,72.941176%,72.941176%);stroke-opacity:1;stroke-miterlimit:10;" d="M 40 40 L 160 40 M 100 40 L 100 180 M 100 180 L 140 160 M 100 180 L 60 160 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 168 160 C 168 175.464844 155.464844 188 140 188 C 124.535156 188 112 175.464844 112 160 C 112 144.535156 124.535156 132 140 132 C 155.464844 132 168 144.535156 168 160 M 159.800781 179.800781 L 159.800781 196.601562 M 159.800781 179.800781 L 143 177.785156 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 168 160 C 168 175.464844 155.464844 188 140 188 C 124.535156 188 112 175.464844 112 160 C 112 144.535156 124.535156 132 140 132 C 155.464844 132 168 144.535156 168 160 M 159.800781 179.800781 L 159.800781 196.601562 M 159.800781 179.800781 L 143 177.785156 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-1" x="133" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 179.800781 20.199219 L 179.800781 3.398438 M 179.800781 20.199219 L 163 22.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 40 C 188 55.464844 175.464844 68 160 68 C 144.535156 68 132 55.464844 132 40 C 132 24.535156 144.535156 12 160 12 C 175.464844 12 188 24.535156 188 40 M 179.800781 20.199219 L 179.800781 3.398438 M 179.800781 20.199219 L 163 22.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-2" x="153" y="47"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 88 160 C 88 175.464844 75.464844 188 60 188 C 44.535156 188 32 175.464844 32 160 C 32 144.535156 44.535156 132 60 132 C 75.464844 132 88 144.535156 88 160 M 40.199219 179.800781 L 40.199219 196.601562 M 40.199219 179.800781 L 57 177.785156 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 88 160 C 88 175.464844 75.464844 188 60 188 C 44.535156 188 32 175.464844 32 160 C 32 144.535156 44.535156 132 60 132 C 75.464844 132 88 144.535156 88 160 M 40.199219 179.800781 L 40.199219 196.601562 M 40.199219 179.800781 L 57 177.785156 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-3" x="53" y="167"/>
</g>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(32.941176%,67.843137%,11.372549%);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 20.199219 20.199219 L 20.199219 3.398438 M 20.199219 20.199219 L 37 22.214844 "/>
<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(255,187,0);stroke-opacity:1;stroke-miterlimit:10;" d="M 68 40 C 68 55.464844 55.464844 68 40 68 C 24.535156 68 12 55.464844 12 40 C 12 24.535156 24.535156 12 40 12 C 55.464844 12 68 24.535156 68 40 M 20.199219 20.199219 L 20.199219 3.398438 M 20.199219 20.199219 L 37 22.214844 "/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
<use xlink:href="#glyph0-4" x="33" y="47"/>
</g>

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before After
Before After

View file

@ -3,7 +3,7 @@
}
.tab-adjustments .range .marker, .tab-adjustments .channel-slider .noUi-connect {
background: #92b67c;
background: #ffbb00;
box-shadow: inset 0 0px 2px rgba(0, 0, 0, 0.4), 0px 1px 0px rgba(255, 255, 255, 0.6);
}

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabAdjustments"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note spacebottom">
<div class="note_spacer">
@ -119,4 +119,4 @@
</tr>
</tbody>
</table>
</div>
</div>

View file

@ -5,7 +5,6 @@ TABS.adjustments = {};
TABS.adjustments.initialize = function (callback) {
GUI.active_tab_ref = this;
GUI.active_tab = 'adjustments';
googleAnalytics.sendAppView('Adjustments');
function get_adjustment_ranges() {
MSP.send_message(MSP_codes.MSP_ADJUSTMENT_RANGES, false, false, get_box_ids);
@ -287,4 +286,4 @@ TABS.adjustments.initialize = function (callback) {
TABS.adjustments.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -9,18 +9,17 @@
}
.tab-auxiliary .range .marker, .tab-auxiliary .channel-slider .noUi-connect {
background: #59AA29;
background: #92b67c;
background: #ffbb00;
border-radius: 3px;
}
.tab-auxiliary .mode.on .info {
background: #59aa29;
color: white;
background: #ffbb00;
color: black;
}
.tab-auxiliary .mode.on:nth-child(odd) .info {
background: #59aa29;
background: #ffbb00;
}
.tab-auxiliary .mode.off .info {

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabAuxiliary">tabAuxiliary</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note spacebottom">
<div class="note_spacer">
@ -55,4 +55,4 @@
<a class="deleteRange" href="#">&nbsp;</a>
</div>
</div>
</div>
</div>

View file

@ -5,7 +5,6 @@ TABS.auxiliary = {};
TABS.auxiliary.initialize = function (callback) {
GUI.active_tab_ref = this;
GUI.active_tab = 'auxiliary';
googleAnalytics.sendAppView('Auxiliary');
function get_mode_ranges() {
MSP.send_message(MSP_codes.MSP_MODE_RANGES, false, false, get_box_ids);
@ -290,4 +289,4 @@ TABS.auxiliary.initialize = function (callback) {
TABS.auxiliary.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -11,7 +11,6 @@ TABS.cli.initialize = function (callback) {
if (GUI.active_tab != 'cli') {
GUI.active_tab = 'cli';
googleAnalytics.sendAppView('CLI');
}
$('#content').load("./tabs/cli.html", function () {
@ -99,7 +98,10 @@ TABS.cli.sendSlowly = function (out_arr, i, timeout_needle) {
bufView[out_arr[i].length] = 0x0D; // enter (\n)
serial.send(bufferOut);
}, timeout_needle * 5);
if (out_arr[i].substring(1, 7) == 'profile') {
timeout_needle *= 2; // switching profiles needs additional time
}
}, timeout_needle * 15);
};
TABS.cli.read = function (readInfo) {
@ -221,5 +223,6 @@ TABS.cli.cleanup = function (callback) {
GUI.timeout_add('waiting_for_bootup', function waiting_for_bootup() {
if (callback) callback();
}, 1000); // if we dont allow enough time to reboot, CRC of "first" command sent will fail, keep an eye for this one
CONFIGURATOR.cliActive = false;
});
};

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabConfiguration">Configuration</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note" style="margin-bottom: 20px;">
<div class="note_spacer">
@ -384,7 +384,7 @@
<span i18n="configurationGPSubxSbas"></span>
</div>
<div class="number">
<label> <input type="number" name="mag_declination" step="0.1" min="-180" max="180" />
<label> <input type="number" name="mag_declination" step="0.01" min="-180" max="180" />
<span i18n="configurationMagDeclination"></span>
</label>
</div>
@ -433,7 +433,7 @@
i18n="configuration3dNeutral"></span>
</label>
</div>
<div class="number">
<div class="number 3ddeadbandthrottle" >
<label> <input type="number" name="3ddeadbandthrottle" step="1" min="0" max="1000" /> <span
i18n="configuration3dDeadbandThrottle"></span>
</label>

View file

@ -7,7 +7,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
if (GUI.active_tab != 'configuration') {
GUI.active_tab = 'configuration';
googleAnalytics.sendAppView('Configuration');
}
function load_config() {
@ -363,7 +362,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
$('input[name="pitch"]').val(CONFIG.accelerometerTrims[0]);
// fill magnetometer
$('input[name="mag_declination"]').val(MISC.mag_declination);
$('input[name="mag_declination"]').val(MISC.mag_declination.toFixed(2));
//fill motor disarm params and FC loop time
if(semver.gte(CONFIG.apiVersion, "1.8.0")) {
@ -407,7 +406,11 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
$('input[name="3ddeadbandlow"]').val(_3D.deadband3d_low);
$('input[name="3ddeadbandhigh"]').val(_3D.deadband3d_high);
$('input[name="3dneutral"]').val(_3D.neutral3d);
$('input[name="3ddeadbandthrottle"]').val(_3D.deadband3d_throttle);
if (semver.lt(CONFIG.apiVersion, "1.17.0")) {
$('input[name="3ddeadbandthrottle"]').val(_3D.deadband3d_throttle);
} else {
$('.3ddeadbandthrottle').hide();
}
}
// UI hooks
@ -487,26 +490,15 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
_3D.deadband3d_low = parseInt($('input[name="3ddeadbandlow"]').val());
_3D.deadband3d_high = parseInt($('input[name="3ddeadbandhigh"]').val());
_3D.neutral3d = parseInt($('input[name="3dneutral"]').val());
_3D.deadband3d_throttle = ($('input[name="3ddeadbandthrottle"]').val());
if (semver.lt(CONFIG.apiVersion, "1.17.0")) {
_3D.deadband3d_throttle = ($('input[name="3ddeadbandthrottle"]').val());
}
SENSOR_ALIGNMENT.align_gyro = parseInt(orientation_gyro_e.val());
SENSOR_ALIGNMENT.align_acc = parseInt(orientation_acc_e.val());
SENSOR_ALIGNMENT.align_mag = parseInt(orientation_mag_e.val());
// track feature usage
if (isFeatureEnabled('RX_SERIAL')) {
googleAnalytics.sendEvent('Setting', 'SerialRxProvider', serialRXtypes[BF_CONFIG.serialrx_type]);
}
for (var i = 0; i < features.length; i++) {
var featureName = features[i].name;
if (isFeatureEnabled(featureName)) {
googleAnalytics.sendEvent('Setting', 'Feature', featureName);
}
}
function save_serial_config() {
if (semver.lt(CONFIG.apiVersion, "1.6.0")) {
MSP.send_message(MSP_codes.MSP_SET_CF_SERIAL_CONFIG, MSP.crunch(MSP_codes.MSP_SET_CF_SERIAL_CONFIG), false, save_misc);

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title">Failsafe</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note newpane">
<div class="note_spacer">
@ -89,7 +89,7 @@
<div class="helpicon cf_tip" i18n_title="failsafeKillSwitchHelp"></div>
</div>
<div class="number stage2">
<label> <input type="number" name="failsafe_delay" min="0" max="2000" /> <span
<label> <input type="number" name="failsafe_delay" min="0" max="200" /> <span
i18n="failsafeDelayItem"></span>
</label>
<div class="helpicon cf_tip" i18n_title="failsafeDelayHelp"></div>

View file

@ -7,7 +7,6 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
if (GUI.active_tab != 'failsafe') {
GUI.active_tab = 'failsafe';
googleAnalytics.sendAppView('Failsafe');
}
function load_rx_config() {

View file

@ -61,12 +61,12 @@
}
.tab-firmware_flasher .info .progress.valid::-webkit-progress-bar {
background-color: #56ac1d;
background-color: #ffbb00;
border-radius: 4px;
}
.tab-firmware_flasher .info .progress.valid::-webkit-progress-value {
background-color: #56ac1d;
background-color: #ffbb00;
border-radius: 4px;
}

View file

@ -6,7 +6,6 @@ TABS.firmware_flasher.initialize = function (callback) {
if (GUI.active_tab != 'firmware_flasher') {
GUI.active_tab = 'firmware_flasher';
googleAnalytics.sendAppView('Firmware Flasher');
}
@ -73,7 +72,7 @@ TABS.firmware_flasher.initialize = function (callback) {
var descriptor = {
"releaseUrl": release.html_url,
"name" : semver.clean(release.name),
"version" : release.tag_name,
"version" : release.name,
"url" : asset.browser_download_url,
"file" : asset.name,
"target" : target,
@ -88,7 +87,9 @@ TABS.firmware_flasher.initialize = function (callback) {
releaseDescriptors.sort(function(o1,o2){
// compare versions descending
var cmpVal = semver(o2.version).compare(semver(o1.version));
var oo1 = o1.version.replace(/[^0-9]+/g, "");
var oo2 = o2.version.replace(/[^0-9]+/g, "");
var cmpVal = (oo2<oo1?-1:(oo2>oo1?1:0));
if (cmpVal == 0){
// compare target names ascending
cmpVal = (o1.target<o2.target?-1:(o1.target>o2.target?1:0));
@ -99,8 +100,7 @@ TABS.firmware_flasher.initialize = function (callback) {
var optionIndex = 1;
releaseDescriptors.forEach(function(descriptor){
var select_e =
$("<option value='{0}'>{1} {2} {3} ({4})</option>".format(
optionIndex++,
$("<option value='{0}'>{1} {2} ({3})</option>".format(
descriptor.name,
descriptor.target,
descriptor.date,
@ -134,7 +134,7 @@ TABS.firmware_flasher.initialize = function (callback) {
})
};
$.get('https://api.github.com/repos/cleanflight/cleanflight/releases', function (releases){
$.get('https://api.github.com/repos/betaflight/betaflight/releases', function (releases){
processReleases(releases);
TABS.firmware_flasher.releases = releases;
@ -193,7 +193,6 @@ TABS.firmware_flasher.initialize = function (callback) {
parsed_hex = data;
if (parsed_hex) {
googleAnalytics.sendEvent('Flashing', 'Firmware', 'local');
$('a.flash_firmware').removeClass('disabled');
$('span.progressLabel').text('Loaded Local Firmware: (' + parsed_hex.bytes_total + ' bytes)');
@ -238,13 +237,12 @@ TABS.firmware_flasher.initialize = function (callback) {
if (parsed_hex) {
var url;
googleAnalytics.sendEvent('Flashing', 'Firmware', 'online');
$('span.progressLabel').html('<a class="save_firmware" href="#" title="Save Firmware">Loaded Online Firmware: (' + parsed_hex.bytes_total + ' bytes)</a>');
$('a.flash_firmware').removeClass('disabled');
if (summary.commit) {
$.get('https://api.github.com/repos/cleanflight/cleanflight/commits/' + summary.commit, function (data) {
$.get('https://api.github.com/repos/betaflight/betaflight/commits/' + summary.commit, function (data) {
var data = data,
d = new Date(data.commit.author.date),
offset = d.getTimezoneOffset() / 60,
@ -256,7 +254,7 @@ TABS.firmware_flasher.initialize = function (callback) {
$('div.git_info .committer').text(data.commit.author.name);
$('div.git_info .date').text(date);
$('div.git_info .hash').text(data.sha.slice(0, 7)).prop('href', 'https://github.com/cleanflight/cleanflight/commit/' + data.sha);
$('div.git_info .hash').text(data.sha.slice(0, 7)).prop('href', 'https://api.github.com/betaflight/betaflight/commit/' + data.sha);
$('div.git_info .message').text(data.commit.message);

View file

@ -119,7 +119,7 @@ progress[value]::-webkit-progress-bar {
progress[value]::-webkit-progress-value {
background-image: -webkit-linear-gradient(top, rgba(255, 255, 255, .15), rgba(0, 0, 0, .15)),
-webkit-linear-gradient(left, #59aa29, #59aa29);
-webkit-linear-gradient(left, #ffbb00, #ffbb00);
border-radius: 2px;
box-shadow: 0px 0px 3px rgba(0, 0, 0, 0.25) inset;
}

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabGPS">GPS</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
@ -168,4 +168,4 @@
</div>
</div>
</div>
</div>

View file

@ -6,7 +6,6 @@ TABS.gps.initialize = function (callback) {
if (GUI.active_tab != 'gps') {
GUI.active_tab = 'gps';
googleAnalytics.sendAppView('GPS');
}
function load_html() {
@ -156,4 +155,4 @@ TABS.gps.initialize = function (callback) {
TABS.gps.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -28,7 +28,7 @@
}
.tab-help li span a {
color: #59aa29;
color: #ffbb00;
}
.tab-help .subline {

View file

@ -6,7 +6,6 @@ TABS.help.initialize = function (callback) {
if (GUI.active_tab != 'help') {
GUI.active_tab = 'help';
googleAnalytics.sendAppView('help');
}
$('#content').load("./tabs/help.html", function () {
@ -18,4 +17,4 @@ TABS.help.initialize = function (callback) {
TABS.help.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -9,17 +9,19 @@
min-height: 100%;
height: 100%;
overflow-y: auto;
background-color: #436c2c;
background-color: #2e2e2e;
}
.tab-landing .content_top {
height: 140px;
background: #59aa29;
background: #fff;
padding: 20px;
background-image: url(../images/pattern.png);
background-size: 300px;
}
.tab-landing .content_mid {
background-color: #eaeaea;
background-color: #ffbb00;
overflow: hidden;
}
@ -35,13 +37,13 @@
margin-right: auto;
margin-top: 5px;
width: 800px;
color: white;
color: black;
font-size: 14px;
font-family: 'open_sanslight', Arial;
}
.tab-landing .logowrapper img {
width: 420px;
width: 600px;
margin: 5px;
}
@ -174,7 +176,7 @@
#changelog .wrapper {
height: 100%;
padding: 0 20px;
border-left: 5px solid green;
border-left: 5px solid #ffbb00;
overflow-y: auto;
display: none;
}
@ -184,7 +186,7 @@
top: 50px;
right: 215px;
position: absolute;
background: green;
background: #ffbb00;
border-radius: 5px 5px 0 0;
border-bottom: none;
height: 30px;
@ -195,7 +197,7 @@
padding: 5px 10px;
width: 70px;
text-align: center;
color: white;
color: #000;
}
#changelog .title {

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="content_top">
<div class="logowrapper" align="center">
<span>Welcome to</span><br> <img src="../images/cf_logo_white.svg" />
<img src="../images/cf_logo_white.svg" />
<div class="" i18n="defaultWelcomeIntro" align="center"></div>
</div>
</div>
@ -24,7 +24,7 @@
<h3 i18n="defaultDonateHead"></h3>
<div i18n="defaultDonateText"></div>
<div class="donate">
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TSQKVT6UYKGL6"
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=dreambb1982%40gmail%2ecom&lc=NL&item_name=Betaflight&no_note=0&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest"
target="_blank" title="Donate"><img src="./images/btn-donate.png" alt="Paypal"
height="30" /></a>
</li>
@ -34,27 +34,6 @@
</div>
<div class="content_foot">
<div class="sponsors">
<div class="title" i18n="defaultSponsorsHead"></div>
<ul>
<li><a href="http://www.massiverc.com" title="www.massiverc.com" target="_blank">MassiveRC</a></li>
<li><a href="http://www.armattanquads.com" title="www.armattanquads.com" target="_blank">Armattan
Quads</a></li>
<li><a href="http://www.bcmultirotors.com" title="www.bcmultirotors.com" target="_blank">Bungeecow
Multirotors</a></li>
<li><a href="http://www.immersionrc.com" title="www.immersionrc.com" target="_blank">Immersion
RC</a></li>
<li><a href="http://www.radioc.co.uk" title="www.radioc.co.uk" target="_blank">RadioC</a></li>
</ul>
<ul>
<li><a href="http://www.multiwiicopter.com" title="www.multiwiicopter.com" target="_blank">MultiiWiiCopter</a></li>
<li><a href="http://www.overskyrc.com" title="www.overskyrc.com" target="_blank">OverSkyRC</a></li>
<li><a href="http://multirotormania.com" title="multirotormania.com" target="_blank">Multi
Rotor Mania</a></li>
<li><a href="http://www.scorpionsystem.com" title="www.scorpionsystem.com" target="_blank">Scorpion
Power Systems</a></li>
<li><a href="http://www.multigp.com" title="www.multigp.com" target="_blank">MultiGP</a></li>
<li><a href="http://makeitbuildit.co.uk" title="makeitbuildit.co.uk" target="_blank">MakeItBuildIt</a></li>
</ul>
</div>
</div>
</div>

View file

@ -6,7 +6,6 @@ TABS.landing.initialize = function (callback) {
if (GUI.active_tab != 'landing') {
GUI.active_tab = 'landing';
googleAnalytics.sendAppView('Landing');
}
$('#content').load("./tabs/landing.html", function () {
@ -16,10 +15,6 @@ TABS.landing.initialize = function (callback) {
// load changelog content
$('#changelog .log').load('./changelog.html');
$('div.welcome a, div.sponsors a').click(function () {
googleAnalytics.sendEvent('ExternalUrls', 'Click', $(this).prop('href'));
});
/** changelog trigger **/
$("#changelog_toggle").on('click', function() {
var state = $(this).data('state2');

View file

@ -17,6 +17,8 @@
float: left;
margin-right: 10px;
border-radius: 3px;
background-color: #dcdcdc;
border: silver;
}
.tab-led-strip .mainGrid .gPoint {
@ -26,7 +28,7 @@
height: 23px;
margin: 3px;
border-radius: 7px;
background: #ececec;;
background: #e9e9e9;
cursor: pointer;
}
@ -72,6 +74,24 @@
border-color: black;
}
.tab-led-strip .gPoint.function-g { /* GPS */
background: green;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: rgb(52, 155, 255);
}
.tab-led-strip .gPoint.function-s { /* RSSI */
background: brown;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: rgb(52, 155, 255);
}
.tab-led-strip .gPoint.function-b { /* Blink */
background: white;
box-shadow: inset 0 0 30px rgba(0, 0, 0, .7);
border-color: rgb(52, 155, 255);
}
.tab-led-strip .gPoint.function-i.function-f {
background: linear-gradient(to bottom, yellow 0%,yellow 50%,rgb(50, 205, 50) 50%, rgb(50, 205, 50) 100%);
}
@ -137,10 +157,9 @@
.tab-led-strip button {
text-align: center;
font-weight: bold;
border: 1px solid silver;
background-color: #ececec;
border-radius: 3px;
padding: 7px 6px;
margin: 3px 0;
}
@ -165,12 +184,15 @@
.tab-led-strip .functions .function-w.btnOn {background: red;}
.tab-led-strip .functions .function-f.btnOn {background: rgb(50, 205, 50);}
.tab-led-strip .functions .function-i.btnOn {background: yellow; color: #333;}
.tab-led-strip .functions .function-a.btnOn {background: blue;}
.tab-led-strip .functions .function-a.btnOn {background: #0084ff;}
.tab-led-strip .functions .function-t.btnOn {background: orange;}
.tab-led-strip .functions .function-r.btnOn {background: #acacac;}
.tab-led-strip .functions .function-c.btnOn {
background: linear-gradient( to bottom right, rgba(255, 0, 0, .5) 0%, rgba(255, 255, 0, 0.5) 15%, rgba(0, 255, 0, .5) 30%, rgba(0, 255, 255, .5) 50%, rgba(0, 0, 255, .5) 65%, rgba(255, 0, 255, .5) 80%, rgba(255, 0, 0, .5) 100%);
}
.tab-led-strip .functions .function-g.btnOn {background: green;}
.tab-led-strip .functions .function-s.btnOn {background: brown;}
.tab-led-strip .functions .function-b.btnOn {background: white;}
.tab-led-strip .color-1 {background: white;}
.tab-led-strip .color-2 {background: red;}
@ -304,8 +326,9 @@
.tab-led-strip .wires-remaining div {
font-size: 40px;
color: #7AAE2D;
font-family: monospace;
color: #ffbb00;
margin-bottom: -5px;
margin-top: -10px;
}
.tab-led-strip .wires-remaining.error div {

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabLedStrip"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note spacebottom">
<div class="note_spacer">
@ -45,6 +45,9 @@
<button class="function-t w50">Throttle</button>
<button class="function-r w50">Ring</button>
<button class="function-c w50">Color</button>
<button class="function-g w50 extra_functions">GPS</button>
<button class="function-s w50 extra_functions">RSSI</button>
<button class="function-b w50 extra_functions">Blink</button>
</div>
<div class="section">LED Orientation and Color</div>
@ -84,7 +87,6 @@
<button class="funcWireClearSelect w50">Clear selected</button>
<button class="funcWireClear w50">Clear ALL Wiring</button>
</div>
<p>LEDs without wire ordering number will not be saved.</p>
</div>
<div class="clear-both"></div>
</div>
@ -93,4 +95,4 @@
<a class="save" href="#" i18n="ledStripButtonSave"></a>
</div>
</div>
</div>
</div>

View file

@ -2,7 +2,7 @@
TABS.led_strip = {
wireMode: false,
functions: ['w', 'f', 'i', 'a', 't', 'r', 'c'],
functions: ['w', 'f', 'i', 'a', 't', 'r', 'c', 'g', 's', 'b'],
directions: ['n', 'e', 's', 'w', 'u', 'd'],
};
@ -13,7 +13,6 @@ TABS.led_strip.initialize = function (callback, scrollPosition) {
if (GUI.active_tab != 'led_strip') {
GUI.active_tab = 'led_strip';
googleAnalytics.sendAppView('LED Strip');
}
function load_led_config() {
@ -288,6 +287,10 @@ TABS.led_strip.initialize = function (callback, scrollPosition) {
});
if (CONFIG.apiVersion < '1.18.0') {
$(".extra_functions").hide();
}
GUI.content_ready(callback);
}

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabLogging"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note">
<div class="note_spacer">
@ -78,4 +78,4 @@
<a class="log_file" href="#" i18n="loggingButtonLogFile"></a>
</div>
</div>
</div>
</div>

View file

@ -6,7 +6,6 @@ TABS.logging.initialize = function (callback) {
if (GUI.active_tab != 'logging') {
GUI.active_tab = 'logging';
googleAnalytics.sendAppView('Logging');
}
var requested_properties = [],
@ -310,4 +309,4 @@ TABS.logging.initialize = function (callback) {
TABS.logging.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -8,7 +8,6 @@ TABS.modes.initialize = function (callback) {
if (GUI.active_tab != 'modes') {
GUI.active_tab = 'modes';
googleAnalytics.sendAppView('Modes');
}
function get_box_data() {
@ -155,4 +154,4 @@ TABS.modes.initialize = function (callback) {
TABS.modes.cleanup = function (callback) {
if (callback) callback();
};
};

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabMotorTesting">Motors</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="gui_box grey" style="margin-bottom: 15px;">
<div class="wrapper modelAndAccel">

View file

@ -14,7 +14,6 @@ TABS.motors.initialize = function (callback) {
if (GUI.active_tab != 'motors') {
GUI.active_tab = 'motors';
googleAnalytics.sendAppView('Motors');
}
function get_arm_status() {
@ -480,7 +479,7 @@ TABS.motors.initialize = function (callback) {
color = parseInt(data * 0.009);
$('.motor-' + i + ' .label', motors_wrapper).text(MOTOR_DATA[i]);
$('.motor-' + i + ' .indicator', motors_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1.'+ color +')'});
$('.motor-' + i + ' .indicator', motors_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(255,187,0,1.'+ color +')'});
}
// servo indicators are still using old (not flexible block scale), it will be changed in the future accordingly
@ -491,7 +490,7 @@ TABS.motors.initialize = function (callback) {
color = parseInt(data * 0.009);
$('.servo-' + i + ' .label', servos_wrapper).text(SERVO_DATA[i]);
$('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1'+ color +')'});
$('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(255,187,0,1'+ color +')'});
}
//keep the following here so at least we get a visual cue of our motor setup
update_arm_status();

View file

@ -107,7 +107,7 @@
.tab-onboard_logging .dataflash-used,
.tab-onboard_logging .sdcard-other {
background-color: #59AA29;
background-color: #ffbb00;
border-radius: 4px;
}
@ -263,13 +263,13 @@
margin-top: 8px;
margin-bottom: 8px;
margin-right: 10px;
background-color: #59aa29;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;
border: 1px solid #dba718;
color: #000;
font-family: 'open_sansbold', Arial;
font-size: 12px;
text-shadow: 0px 1px rgba(0, 0, 0, 0.25);
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
display: inline-block;
cursor: pointer;
transition: all ease 0.2s;
@ -279,11 +279,11 @@
line-height: 28px;
}
.tab-onboard_logging .regular-button:hover {
background-color: #6ac435;
background-color: #ffcc3e;
transition: all ease 0.2s;
}
.tab-onboard_logging .regular-button:active {
background-color: #4d9324;
background-color: #ffcc3e;
transition: all ease 0.0s;
box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
}

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabOnboardLogging"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="require-blackbox-unsupported note">
<div class="note_spacer">

View file

@ -13,7 +13,6 @@ TABS.onboard_logging.initialize = function (callback) {
if (GUI.active_tab != 'onboard_logging') {
GUI.active_tab = 'onboard_logging';
googleAnalytics.sendAppView('onboard_logging');
}
if (CONFIGURATOR.connectionValid) {
@ -467,4 +466,4 @@ TABS.onboard_logging.cleanup = function (callback) {
if (callback) {
callback();
}
};
};

View file

@ -1,4 +1,4 @@
.tab-pid_tuning .rate-tpa th {
.tab-pid_tuning .tpa th {
background-color: #828885;
padding: 4px;
border-left: 0px solid #ccc;
@ -44,23 +44,91 @@
border: 1px solid silver;
}
.tab-pid_tuning .rate-tpa th:nth-child(2) {
.tab-pid_tuning .tpa th:nth-child(2) {
border-top-left-radius: 3px;
}
.tab-pid_tuning .rate-tpa th:first-child {
.tab-pid_tuning .tpa th:first-child {
border-top-left-radius: 3px;
}
.tab-pid_tuning .rate-tpa th:last-child {
.tab-pid_tuning .tpa th:last-child {
border-top-right-radius: 3px;
}
.tab-pid_tuning .rate-tpa {
.tab-pid_tuning .tpa {
/*border: 0px solid #ccc; */
margin-bottom: 10px;
}
.tab-pid_tuning .rc_curve {
float: right;
width: calc(100% - 2px); /* - ( "virtual" margin) */
}
.tab-pid_tuning .rc_curve th {
background-color: #828885;
padding: 4px;
border-left: 0px solid #ccc;
border-bottom: 1px solid #ccc;
font-weight: bold;
color: white;
text-align: left;
}
.tab-pid_tuning .rc_curve th:first-child {
border-top-left-radius: 3px;
}
.tab-pid_tuning .rc_curve th:last-child {
border-top-right-radius: 3px;
}
.tab-pid_tuning .pitch_roll_curve {
margin: 0 0px 0px 0;
width: 100%;
height: 100%;
border: 1px solid silver;
border-radius: 3px;
background-image: url(../images/paper.jpg);
background-size: 200%;
background-position: center;
}
.tab-pid_tuning .rc_yaw_curve {
float: right;
width: calc(100% - 2px); /* - ( "virtual" margin) */
}
.tab-pid_tuning .rc_yaw_curve th {
background-color: #828885;
padding: 4px;
border-left: 0px solid #ccc;
border-bottom: 1px solid #ccc;
font-weight: bold;
color: white;
text-align: left;
}
.tab-pid_tuning .rc_yaw_curve th:first-child {
border-top-left-radius: 3px;
}
.tab-pid_tuning .rc_yaw_curve th:last-child {
border-top-right-radius: 3px;
}
.tab-pid_tuning .yaw_curve {
margin: 0 0px 0px 0;
width: 100%;
height: 100%;
border: 1px solid silver;
border-radius: 3px;
background-image: url(../images/paper.jpg);
background-size: 200%;
background-position: center;
}
.tab-pid_tuning input[type="number"]::-webkit-inner-spin-button {
border: 0;
}
@ -114,7 +182,7 @@
.tab-pid_tuning table td {
padding: 1px;
width: 25%;
width: 14%;
border-right: 1px solid #ccc;
}
@ -191,23 +259,35 @@
line-height: 20px;
}
.tab-pid_tuning .pid_tuning .name {
width: 25%;
.tab-pid_tuning .name {
width: 14%;
}
.tab-pid_tuning .proportional {
width: 25%;
width: 14%;
}
.tab-pid_tuning .integral {
width: 25%;
width: 14%;
}
.tab-pid_tuning .derivative {
width: 25%;
width: 14%;
}
.tab-pid_tuning .rate-tpa {
.tab-pid_tuning .rc_rate {
width: 14%;
}
.tab-pid_tuning .rate {
width: 14%;
}
.tab-pid_tuning .rc_expo {
width: 14%;
}
.tab-pid_tuning .tpa {
float: right;
width: calc(100% - 2px); /* - ( "virtual" margin) */
}
@ -335,7 +415,7 @@
right: 0;
z-index: -1;
overflow: hidden;
background-image: url("../images/light-wide-2.svg");
background-image: url("../images/light-wide-1.svg");
background-repeat: no-repeat;
background-position: 95% 20%;
background-size: 430px;
@ -386,4 +466,4 @@
.tab-pid_tuning .topspacer {
margin-top:15px;
}
}

View file

@ -3,7 +3,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabPidTuning"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="cf_column half">
<div class="controller">
@ -25,7 +25,7 @@
</div>
<form name="pid-tuning" id="pid-tuning">
<div class="clear-both"></div>
<div class="cf_column half">
<div class="cf_column twothird">
<div class="gui_box grey">
<table class="pid_titlebar">
<tr>
@ -33,34 +33,55 @@
<th class="proportional" i18n="pidTuningProportional"></th>
<th class="integral" i18n="pidTuningIntegral"></th>
<th class="derivative" i18n="pidTuningDerivative"></th>
<th class="rc_rate" i18n="pidTuningRcRate"></th>
<th class="rate" i18n="pidTuningRate"></th>
<th class="rc_expo" i18n="pidTuningRcExpo"></th>
</tr>
</table>
<table id="pid_main" class="pid_tuning">
<tr>
<th colspan="4">
<th colspan="8">
<div class="pid_mode" i18n="pidTuningBasic"></div>
</th>
</tr>
<tr class="ROLL">
<!-- 0 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
<td rowspan="3"><input type="number" name="rc_rate" step="0.01" min="0" max="2.5" /></td>
<td class="roll_rate"><input type="number" name="roll_rate" step="0.01" min="0" max="1.00" /></td>
<td class="roll_pitch_rate" rowspan="2"><input type="number" name="roll_pitch_rate" step="0.01" min="0" max="1.00" /></td>
<td rowspan="2"><input type="number" name="rc_expo" step="0.01" min="0" max="1" /></td>
</tr>
<tr class="PITCH">
<!-- 1 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
<td class="pitch_rate"><input type="number" name="pitch_rate" step="0.01" min="0" max="1.00" /></td>
</tr>
<tr class="YAW">
<!-- 2 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
<td><input type="number" name="yaw_rate" step="0.01" min="0" max="2.55" /></td>
<td><input type="number" name="rc_yaw_expo" step="0.01" min="0" max="1" /></td>
</tr>
</table>
</div>
<div class="gui_box grey topspacer">
<table class="pid_titlebar">
<tr>
<th class="name" i18n="pidTuningName""></th>
<th class="proportional" i18n="pidTuningProportional"></th>
<th class="integral" i18n="pidTuningIntegral"></th>
<th class="derivative" i18n="pidTuningDerivative"></th>
</tr>
</table>
<table id="pid_baro" class="pid_tuning">
@ -72,15 +93,15 @@
<tr class="ALT">
<!-- 3 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
</tr>
<tr class="Vario">
<!-- 9 -->
<td>VEL</td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
</tr>
</table>
@ -93,7 +114,7 @@
<tr class="MAG">
<!-- 8 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td></td>
<td></td>
</tr>
@ -107,23 +128,24 @@
<tr class="Pos">
<!-- 4 -->
<td></td>
<td><input type="number" name="p" step="0.01" min="0" max="2.55" /></td>
<td><input type="number" name="i" step="0.01" min="0" max="2.55" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<!-- <td><input type="number" name="i" step="1" min="0" max="255" /></td> -->
<td></td>
<td></td>
</tr>
<tr class="PosR">
<!-- 5 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.01" min="0" max="2.55" /></td>
<td><input type="number" name="d" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
</tr>
<tr class="NavR">
<!-- 6 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.01" min="0" max="2.55" /></td>
<td><input type="number" name="d" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
</tr>
</table>
</div>
@ -145,48 +167,67 @@
<tr class="LEVEL">
<!-- 7 -->
<td></td>
<td><input type="number" name="p" step="0.1" min="0" max="25.5" /></td>
<td><input type="number" name="i" step="0.001" min="0" max="0.255" /></td>
<td><input type="number" name="p" step="1" min="0" max="255" /></td>
<td><input type="number" name="i" step="1" min="0" max="255" /></td>
<td><input type="number" name="d" step="1" min="0" max="255" /></td>
</tr>
</table>
</div>
</div>
<div class="cf_column half">
<div class="cf_column third_right">
<div class="spacer_left">
<table class="rate-tpa cf">
<table class="rc_curve cf">
<thead>
<tr>
<th class="roll-pitch" i18n="pidTuningRollPitchRate"></th>
<th class="roll" i18n="pidTuningRollRate"></th>
<th class="pitch" i18n="pidTuningPitchRate"></th>
<th i18n="pidTuningYawRate"></th>
</tr>
</thead>
<tbody>
<tr>
<td class="roll-pitch"><input type="number" name="roll-pitch" step="0.01" min="0"
max="1.00" /></td>
<td class="roll"><input type="number"
name="roll" step="0.01" min="0" max="1.00" /></td>
<td class="pitch"><input type="number" name="pitch" step="0.01" min="0" max="1.00" /></td>
<td><input type="number" name="yaw" step="0.01" min="0" max="2.55" /></td>
</tr>
</tbody>
<th i18n="rcCurve"></th>
</tr>
</thead>
</tbody>
<tr>
<td>
<div class="spacer" style="margin-top: 10px; margin-bottom: 10px;">
<div class="pitch_roll_curve">
<canvas style="width: 100%; height: 100%"></canvas>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<table class="rate-tpa cf">
</div>
<div class="spacer_left topspacer">
<table class="rc_yaw_curve cf">
<thead>
<tr>
<th i18n="rcYawCurve"></th>
</tr>
</thead>
</tbody>
<tr>
<td>
<div class="spacer" style="margin-top: 10px; margin-bottom: 10px;">
<div class="yaw_curve">
<canvas style="width: 100%; height: 100%"></canvas>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<div class="spacer_left topspacer">
<table class="tpa cf">
<thead>
<tr>
<th i18n="pidTuningTPA"></th>
<th class="tpa-breakpoint" i18n="pidTuningTPABreakPoint"></th>
</tr>
</thead>
<tbody>
<tbody>
<tr>
<td class="leftzero"><input type="number" name="tpa" step="0.01" min="0"
max="1.00" /></td>
<td class="tpa-breakpoint"><input type="number" name="tpa-breakpoint" step="10"
min="1000" max="2000" /></td>
<td class="tpa-breakpoint"><input type="number" name="tpa-breakpoint" step="10" min="1000" max="2000" /></td>
</tr>
</tbody>
</table>
@ -203,4 +244,4 @@
<a class="refresh" href="#" i18n="pidTuningButtonRefresh"></a>
</div>
</div>
</div>
</div>

View file

@ -6,10 +6,8 @@ TABS.pid_tuning = {
TABS.pid_tuning.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'pid_tuning') {
GUI.active_tab = 'pid_tuning';
googleAnalytics.sendAppView('PID Tuning');
}
function get_pid_controller() {
@ -45,13 +43,13 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .ROLL input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[0][i++].toFixed(1));
$(this).val(PIDs[0][i++]);
break;
case 1:
$(this).val(PIDs[0][i++].toFixed(3));
$(this).val(PIDs[0][i++]);
break;
case 2:
$(this).val(PIDs[0][i++].toFixed(0));
$(this).val(PIDs[0][i++]);
break;
}
});
@ -60,13 +58,13 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .PITCH input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[1][i++].toFixed(1));
$(this).val(PIDs[1][i++]);
break;
case 1:
$(this).val(PIDs[1][i++].toFixed(3));
$(this).val(PIDs[1][i++]);
break;
case 2:
$(this).val(PIDs[1][i++].toFixed(0));
$(this).val(PIDs[1][i++]);
break;
}
});
@ -75,13 +73,13 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .YAW input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[2][i++].toFixed(1));
$(this).val(PIDs[2][i++]);
break;
case 1:
$(this).val(PIDs[2][i++].toFixed(3));
$(this).val(PIDs[2][i++]);
break;
case 2:
$(this).val(PIDs[2][i++].toFixed(0));
$(this).val(PIDs[2][i++]);
break;
}
});
@ -90,33 +88,33 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .ALT input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[3][i++].toFixed(1));
$(this).val(PIDs[3][i++]);
break;
case 1:
$(this).val(PIDs[3][i++].toFixed(3));
$(this).val(PIDs[3][i++]);
break;
case 2:
$(this).val(PIDs[3][i++].toFixed(0));
$(this).val(PIDs[3][i++]);
break;
}
});
i = 0;
$('.pid_tuning .Pos input').each(function () {
$(this).val(PIDs[4][i++].toFixed(2));
$(this).val(PIDs[4][i++]);
});
i = 0;
$('.pid_tuning .PosR input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[5][i++].toFixed(1));
$(this).val(PIDs[5][i++]);
break;
case 1:
$(this).val(PIDs[5][i++].toFixed(2));
$(this).val(PIDs[5][i++]);
break;
case 2:
$(this).val(PIDs[5][i++].toFixed(3));
$(this).val(PIDs[5][i++]);
break;
}
});
@ -125,13 +123,13 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .NavR input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[6][i++].toFixed(1));
$(this).val(PIDs[6][i++]);
break;
case 1:
$(this).val(PIDs[6][i++].toFixed(2));
$(this).val(PIDs[6][i++]);
break;
case 2:
$(this).val(PIDs[6][i++].toFixed(3));
$(this).val(PIDs[6][i++]);
break;
}
});
@ -140,44 +138,53 @@ TABS.pid_tuning.initialize = function (callback) {
$('.pid_tuning .LEVEL input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[7][i++].toFixed(1));
$(this).val(PIDs[7][i++]);
break;
case 1:
$(this).val(PIDs[7][i++].toFixed(3));
$(this).val(PIDs[7][i++]);
break;
case 2:
$(this).val(PIDs[7][i++].toFixed(0));
$(this).val(PIDs[7][i++]);
break;
}
});
i = 0;
$('.pid_tuning .MAG input').each(function () {
$(this).val(PIDs[8][i++].toFixed(1));
$(this).val(PIDs[8][i++]);
});
i = 0;
$('.pid_tuning .Vario input').each(function () {
switch (i) {
case 0:
$(this).val(PIDs[9][i++].toFixed(1));
$(this).val(PIDs[9][i++]);
break;
case 1:
$(this).val(PIDs[9][i++].toFixed(3));
$(this).val(PIDs[9][i++]);
break;
case 2:
$(this).val(PIDs[9][i++].toFixed(0));
$(this).val(PIDs[9][i++]);
break;
}
});
// Fill in data from RC_tuning object
$('.rate-tpa input[name="roll-pitch"]').val(RC_tuning.roll_pitch_rate.toFixed(2));
$('.rate-tpa input[name="roll"]').val(RC_tuning.roll_rate.toFixed(2));
$('.rate-tpa input[name="pitch"]').val(RC_tuning.pitch_rate.toFixed(2));
$('.rate-tpa input[name="yaw"]').val(RC_tuning.yaw_rate.toFixed(2));
$('.rate-tpa input[name="tpa"]').val(RC_tuning.dynamic_THR_PID.toFixed(2));
$('.rate-tpa input[name="tpa-breakpoint"]').val(RC_tuning.dynamic_THR_breakpoint);
$('.pid_tuning input[name="rc_rate"]').val(RC_tuning.RC_RATE.toFixed(2));
$('.pid_tuning input[name="roll_pitch_rate"]').val(RC_tuning.roll_pitch_rate.toFixed(2));
$('.pid_tuning input[name="roll_rate"]').val(RC_tuning.roll_rate.toFixed(2));
$('.pid_tuning input[name="pitch_rate"]').val(RC_tuning.pitch_rate.toFixed(2));
$('.pid_tuning input[name="yaw_rate"]').val(RC_tuning.yaw_rate.toFixed(2));
$('.pid_tuning input[name="rc_expo"]').val(RC_tuning.RC_EXPO.toFixed(2));
$('.pid_tuning input[name="rc_yaw_expo"]').val(RC_tuning.RC_YAW_EXPO.toFixed(2));
$('.tpa input[name="tpa"]').val(RC_tuning.dynamic_THR_PID.toFixed(2));
$('.tpa input[name="tpa-breakpoint"]').val(RC_tuning.dynamic_THR_breakpoint);
if (semver.lt(CONFIG.apiVersion, "1.10.0")) {
$('.pid_tuning input[name="rc_yaw_expo"]').hide();
$('.pid_tuning input[name="rc_expo"]').attr("rowspan", "3");
}
}
function form_to_pid_and_rc() {
@ -233,12 +240,16 @@ TABS.pid_tuning.initialize = function (callback) {
});
// catch RC_tuning changes
RC_tuning.roll_pitch_rate = parseFloat($('.rate-tpa input[name="roll-pitch"]').val());
RC_tuning.roll_rate = parseFloat($('.rate-tpa input[name="roll"]').val());
RC_tuning.pitch_rate = parseFloat($('.rate-tpa input[name="pitch"]').val());
RC_tuning.yaw_rate = parseFloat($('.rate-tpa input[name="yaw"]').val());
RC_tuning.dynamic_THR_PID = parseFloat($('.rate-tpa input[name="tpa"]').val());
RC_tuning.dynamic_THR_breakpoint = parseInt($('.rate-tpa input[name="tpa-breakpoint"]').val());
RC_tuning.RC_RATE = parseFloat($('.pid_tuning input[name="rc_rate"]').val());
RC_tuning.roll_pitch_rate = parseFloat($('.pid_tuning input[name="roll_pitch_rate"]').val());
RC_tuning.roll_rate = parseFloat($('.pid_tuning input[name="roll_rate"]').val());
RC_tuning.pitch_rate = parseFloat($('.pid_tuning input[name="pitch_rate"]').val());
RC_tuning.yaw_rate = parseFloat($('.pid_tuning input[name="yaw_rate"]').val());
RC_tuning.RC_EXPO = parseFloat($('.pid_tuning input[name="rc_expo"]').val());
RC_tuning.RC_YAW_EXPO = parseFloat($('.pid_tuning input[name="rc_yaw_expo"]').val());
RC_tuning.dynamic_THR_PID = parseFloat($('.tpa input[name="tpa"]').val());
RC_tuning.dynamic_THR_breakpoint = parseInt($('.tpa input[name="tpa-breakpoint"]').val());
}
function hideUnusedPids(sensors_detected) {
$('.tab-pid_tuning table.pid_tuning').hide();
@ -333,14 +344,63 @@ TABS.pid_tuning.initialize = function (callback) {
}
if (semver.lt(CONFIG.apiVersion, "1.7.0")) {
$('.rate-tpa .tpa-breakpoint').hide();
$('.rate-tpa .roll').hide();
$('.rate-tpa .pitch').hide();
$('.tpa .tpa-breakpoint').hide();
$('.pid_tuning .roll_rate').hide();
$('.pid_tuning .pitch_rate').hide();
} else {
$('.rate-tpa .roll-pitch').hide();
$('.pid_tuning .roll_pitch_rate').hide();
}
function setCanvasDimensions(canvas) {
canvas.width = canvas.parentNode.clientWidth;
canvas.height = canvas.parentNode.clientHeight;
}
setCanvasDimensions($('.pitch_roll_curve canvas').get(0));
setCanvasDimensions($('.yaw_curve canvas').get(0));
function drawRateCurve(rateElement, expoElement, canvasElement) {
var rate = parseFloat(rateElement.val()),
expo = parseFloat(expoElement.val()),
context = canvasElement.getContext("2d");
// local validation to deal with input event
if (rate >= parseFloat(rateElement.prop('min')) &&
rate <= parseFloat(rateElement.prop('max')) &&
expo >= parseFloat(expoElement.prop('min')) &&
expo <= parseFloat(expoElement.prop('max'))) {
var rateHeight = canvasElement.height;
var rateWidth = canvasElement.width;
// math magic by englishman
var ratey = rateHeight * rate;
// draw
context.clearRect(0, 0, rateWidth, rateHeight);
context.beginPath();
context.moveTo(0, rateHeight);
context.quadraticCurveTo(rateWidth * 11 / 20, rateHeight - ((ratey / 2) * (1 - expo)), rateWidth, rateHeight - ratey);
context.lineWidth = 2;
context.strokeStyle = '#ffbb00';
context.stroke();
}
}
// UI Hooks
// curves
$('.pid_tuning').on('input change', function () {
setTimeout(function () { // let global validation trigger and adjust the values first
var rateElement = $('.pid_tuning input[name="rc_rate"]'),
expoElement = $('.pid_tuning input[name="rc_expo"]'),
yawExpoElement = $('.pid_tuning input[name="rc_yaw_expo"]'),
rcCurveElement = $('.pitch_roll_curve canvas').get(0),
rcYawCurveElement = $('.yaw_curve canvas').get(0);
drawRateCurve(rateElement, expoElement, rcCurveElement);
drawRateCurve(rateElement, yawExpoElement, rcYawCurveElement);
}, 0);
}).trigger('input');
$('a.refresh').click(function () {
GUI.tab_switch_cleanup(function () {
@ -412,4 +472,4 @@ TABS.pid_tuning.cleanup = function (callback) {
if (callback) {
callback();
}
};
};

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabPorts">Ports</div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="require-support">
<div class="note spacebottom">

View file

@ -25,6 +25,11 @@ TABS.ports.initialize = function (callback, scrollPosition) {
functionRules.push(mspFunctionRule);
}
if (semver.gte(CONFIG.apiVersion, "1.18.0")) {
var mavlinkFunctionRule = {name: 'TELEMETRY_MAVLINK', groups: ['telemetry'], sharableWith: ['msp'], notSharableWith: ['blackbox'], maxPorts: 1};
functionRules.push(mavlinkFunctionRule);
}
for (var i = 0; i < functionRules.length; i++) {
functionRules[i].displayName = chrome.i18n.getMessage('portsFunction_' + functionRules[i].name);
}
@ -67,7 +72,6 @@ TABS.ports.initialize = function (callback, scrollPosition) {
if (GUI.active_tab != 'ports') {
GUI.active_tab = 'ports';
googleAnalytics.sendAppView('Ports');
}
load_configuration_from_fc();

View file

@ -156,15 +156,6 @@
margin-bottom: 10px;
}
.tab-receiver .tunings .rate {
margin-bottom: 10px;
}
.tab-receiver .tunings .yaw_rate {
margin-left: 0px;
margin-bottom: 10px;
}
.tab-receiver .tunings table, .tab-receiver .tunings table th, .tab-receiver .tunings table td {
padding: 4px;
text-align: left;
@ -319,17 +310,6 @@
background-position: center;
}
.tab-receiver .pitch_roll_curve {
margin: 0 0px 0px 0;
width: 200px;
height: 117px;
border: 1px solid silver;
border-radius: 3px;
background-image: url(../images/paper.jpg);
background-size: 200%;
background-position: center;
}
.tab-receiver select[name="rx_refresh_rate"] {
float: right;
border: 1px solid silver;
@ -437,4 +417,4 @@
stroke: none;
fill: #828885;
font-size: 10px;
}
}

View file

@ -2,7 +2,7 @@
<div class="content_wrapper">
<div class="tab_title" i18n="tabReceiver"></div>
<div class="cf_doc_version_bt">
<a id="button-documentation" href="https://github.com/cleanflight/cleanflight/releases" target="_blank"></a>
<a id="button-documentation" href="https://github.com/betaflight/betaflight/releases" target="_blank"></a>
</div>
<div class="note" style="margin-bottom: 20px;">
<div class="note_spacer">
@ -71,35 +71,6 @@
</div>
</div>
</div>
<div class="gui_box grey" style="float: right;">
<div class="spacer" style="margin-top: 10px; margin-bottom: 10px;">
<div class="cf_column curves" style="width: calc(50% - 10px);">
<div class="pitch_roll_curve">
<canvas width="200" height="117"></canvas>
</div>
</div>
<div class="fc_column half tunings">
<table class="rate">
<tr>
<th i18n="receiverRcRate"></th>
<th i18n="receiverRcExpo"></th>
</tr>
<tr>
<td><input type="number" name="rate" step="0.01" min="0" max="2.5" /></td>
<td><input type="number" name="expo" step="0.01" min="0" max="1" /></td>
</tr>
</table>
<table class="yaw_rate" style="margin-bottom: 0px;">
<tr>
<th i18n="receiverRcYawExpo"></th>
</tr>
<tr>
<td><input type="number" name="yaw_expo" step="0.01" min="0" max="1" /></td>
</tr>
</table>
</div>
</div>
</div>
</div>
<div class="clear-both"></div>
<div class="gui_box grey" style="padding-top: 10px; padding-bottom: 10px; margin-top: 20px;">
@ -137,4 +108,4 @@
<a class="sticks" href="#" i18n="receiverButtonSticks"></a>
</div>
</div>
</div>
</div>

View file

@ -9,7 +9,6 @@ TABS.receiver.initialize = function (callback) {
if (GUI.active_tab != 'receiver') {
GUI.active_tab = 'receiver';
googleAnalytics.sendAppView('Receiver');
}
function get_misc_data() {
@ -52,14 +51,6 @@ TABS.receiver.initialize = function (callback) {
$('.tunings .throttle input[name="mid"]').val(RC_tuning.throttle_MID.toFixed(2));
$('.tunings .throttle input[name="expo"]').val(RC_tuning.throttle_EXPO.toFixed(2));
$('.tunings .rate input[name="rate"]').val(RC_tuning.RC_RATE.toFixed(2));
$('.tunings .rate input[name="expo"]').val(RC_tuning.RC_EXPO.toFixed(2));
$('.tunings .yaw_rate input[name="yaw_expo"]').val(RC_tuning.RC_YAW_EXPO.toFixed(2));
if (semver.lt(CONFIG.apiVersion, "1.10.0")) {
$('.tunings .yaw_rate input[name="yaw_expo"]').hide();
}
chrome.storage.local.get('rx_refresh_rate', function (result) {
if (result.rx_refresh_rate) {
$('select[name="rx_refresh_rate"]').val(result.rx_refresh_rate).change();
@ -244,40 +235,7 @@ TABS.receiver.initialize = function (callback) {
context.moveTo(midx, midy);
context.quadraticCurveTo(midxr, midyr, 200, 0);
context.lineWidth = 2;
context.strokeStyle = '#59aa29';
context.stroke();
}, 0);
}).trigger('input');
$('.tunings .rate input').on('input change', function () {
setTimeout(function () { // let global validation trigger and adjust the values first
var rateE = $('.tunings .rate input[name="rate"]'),
expoE = $('.tunings .rate input[name="expo"]'),
rate = parseFloat(rateE.val()),
expo = parseFloat(expoE.val()),
pitch_roll_curve = $('.pitch_roll_curve canvas').get(0),
context = pitch_roll_curve.getContext("2d");
// local validation to deal with input event
if (rate >= parseFloat(rateE.prop('min')) &&
rate <= parseFloat(rateE.prop('max')) &&
expo >= parseFloat(expoE.prop('min')) &&
expo <= parseFloat(expoE.prop('max'))) {
// continue
} else {
return;
}
// math magic by englishman
var ratey = rateHeight * rate;
// draw
context.clearRect(0, 0, 200, rateHeight);
context.beginPath();
context.moveTo(0, rateHeight);
context.quadraticCurveTo(110, rateHeight - ((ratey / 2) * (1 - expo)), 200, rateHeight - ratey);
context.lineWidth = 2;
context.strokeStyle = '#59aa29';
context.strokeStyle = '#ffbb00';
context.stroke();
}, 0);
}).trigger('input');
@ -290,12 +248,8 @@ TABS.receiver.initialize = function (callback) {
$('.tunings .throttle input[name="mid"]').val(RC_tuning.throttle_MID.toFixed(2));
$('.tunings .throttle input[name="expo"]').val(RC_tuning.throttle_EXPO.toFixed(2));
$('.tunings .rate input[name="rate"]').val(RC_tuning.RC_RATE.toFixed(2));
$('.tunings .rate input[name="expo"]').val(RC_tuning.RC_EXPO.toFixed(2));
// update visual representation
$('.tunings .throttle input').change();
$('.tunings .rate input').change();
});
});
@ -304,10 +258,6 @@ TABS.receiver.initialize = function (callback) {
RC_tuning.throttle_MID = parseFloat($('.tunings .throttle input[name="mid"]').val());
RC_tuning.throttle_EXPO = parseFloat($('.tunings .throttle input[name="expo"]').val());
RC_tuning.RC_RATE = parseFloat($('.tunings .rate input[name="rate"]').val());
RC_tuning.RC_EXPO = parseFloat($('.tunings .rate input[name="expo"]').val());
RC_tuning.RC_YAW_EXPO = parseFloat($('.tunings .yaw_rate input[name="yaw_expo"]').val());
if (semver.gte(CONFIG.apiVersion, "1.15.0")) {
RC_deadband.yaw_deadband = parseInt($('.deadband input[name="yaw_deadband"]').val());
RC_deadband.deadband = parseInt($('.deadband input[name="deadband"]').val());

View file

@ -113,7 +113,7 @@ a:hover {
margin-top: 0px;
margin-bottom: 0px;
margin-left: 0px;
background-color: #59aa29;
background-color: #ffbb00;
border-radius: 3px;
border: 1px solid #4c8829;
color: #fff;

View file

@ -50,7 +50,7 @@
</div>
<div class="warning">
<p>
These sticks allow Cleanflight to be armed and tested without a transmitter or receiver being present.
These sticks allow BetaFlight to be armed and tested without a transmitter or receiver being present.
However, <strong>this feature is not intended for flight and propellers must not be attached.</strong>
</p>
<p>
@ -62,4 +62,4 @@
</div>
</div>
</body>
</html>
</html>

Some files were not shown because too many files have changed in this diff Show more