From 049c0eb822e128b3f1cda54319ea8d34261a9ede Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Fri, 27 Feb 2015 13:29:35 +1300 Subject: [PATCH 1/5] Stop watermark from covering up "motor test" checkbox Checkbox was previously unclickable if watermark was covering it. --- main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.css b/main.css index b0b4c3b9..cfe901fb 100755 --- a/main.css +++ b/main.css @@ -44,7 +44,7 @@ input[type="number"]::-webkit-inner-spin-button { bottom: 40px; left: 0; right: 0; - z-index: 1; + z-index: -1; overflow: hidden; background-image: url("images/light-wide-1.svg"); background-repeat: no-repeat; From 436eced7b70b88735b7ffe5c74d6f5160c98ae46 Mon Sep 17 00:00:00 2001 From: Nicholas Sherlock Date: Fri, 27 Feb 2015 14:11:53 +1300 Subject: [PATCH 2/5] Fix watermark on CLI tab --- tabs/cli.css | 16 +++++++++++----- tabs/cli.html | 10 ++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tabs/cli.css b/tabs/cli.css index 91082184..e1294cc2 100644 --- a/tabs/cli.css +++ b/tabs/cli.css @@ -5,10 +5,15 @@ padding: 5px; border: 1px dotted silver; } -.tab-cli .window { +.tab-cli .backdrop { + border: 1px solid silver; + background-color: black; + margin-top: 10px; height: calc(100% - 80px); /* - (p, textarea) */ - +} +.tab-cli .window { + height:100%; padding: 5px; overflow-y: scroll; @@ -17,9 +22,7 @@ font-family: monospace; color: white; - border: 1px solid silver; - background-color: black; - + box-sizing: border-box; -webkit-user-select: text; } .tab-cli textarea { @@ -37,4 +40,7 @@ border: 1px solid silver; resize: none; +} +.tab-cli #content-watermark { + z-index:0; } \ No newline at end of file diff --git a/tabs/cli.html b/tabs/cli.html index f83d8620..7b8de74e 100644 --- a/tabs/cli.html +++ b/tabs/cli.html @@ -1,10 +1,12 @@ -

-
-
-
+
+
+
+
+
+
\ No newline at end of file From 9ba21f773f11065a3125ce16ce65ee7c1a012e58 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Fri, 27 Feb 2015 10:08:41 +0000 Subject: [PATCH 3/5] Fix servo channel forwarding configuration. Closes #117. Editor mishap during refactoring in 34d72feb69ddc3b9da5aace75beb8ab396148304. --- js/msp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/msp.js b/js/msp.js index b251f9c2..6c18a19b 100644 --- a/js/msp.js +++ b/js/msp.js @@ -624,7 +624,7 @@ var MSP = { for (var i = 0; i < 8; i ++) { var channelIndex = data.getUint8(i); if (channelIndex < 255) { - SERVO_CONFIG[i].indexOfChannelToForward; + SERVO_CONFIG[i].indexOfChannelToForward = channelIndex; } else { SERVO_CONFIG[i].indexOfChannelToForward = undefined; } From 432d9f0720eabbd1f5a98a02e4a2c3855b8428c1 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Fri, 27 Feb 2015 10:55:05 +0000 Subject: [PATCH 4/5] Update changelog and prepare for release. --- changelog.html | 4 ++++ manifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index d6169581..6a845e5a 100644 --- a/changelog.html +++ b/changelog.html @@ -1,3 +1,7 @@ +2015.02.27 - 0.62.1 - cleanflight +

+ - Minor bug fixes.
+

2015.02.26 - 0.62.0 - cleanflight

- Add flight indicators to setup screen tab.
diff --git a/manifest.json b/manifest.json index 710a0124..91d27926 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "minimum_chrome_version": "38", - "version": "0.62.0", + "version": "0.62.1", "author": "Hydra", "name": "Cleanflight - Configurator", "short_name": "cleanflight", From c3f1c13d54e25b445082bdd1ec432e9875240aa3 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Tue, 3 Mar 2015 16:27:14 +0000 Subject: [PATCH 5/5] Move Documentation and Support links to separate tab. Add a contributing section. Unify help/landing section CSS/html a little. Expand the sponsors panel area in preparation for an updated section. --- _locales/en/messages.json | 9 ++++ js/gui.js | 3 +- main.html | 3 ++ main.js | 3 ++ tabs/help.css | 64 +++++++++++++++++++++++ tabs/help.html | 17 ++++++ tabs/help.js | 21 ++++++++ tabs/landing.css | 105 +++++++++++--------------------------- tabs/landing.html | 43 +++++----------- 9 files changed, 164 insertions(+), 104 deletions(-) create mode 100644 tabs/help.css create mode 100644 tabs/help.html create mode 100644 tabs/help.js diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e8f61491..4a225282 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -62,6 +62,9 @@ "tabLanding": { "message": "Welcome" }, + "tabHelp": { + "message": "Documentation & Support" + }, "tabSetup": { "message": "Setup" @@ -210,6 +213,12 @@ "defaultWelcomeText": { "message": "Welcome to Cleanflight - Configurator, a utility designed to simplify updating, configuring and tuning of your flight controller.

The application supports all hardware that can run cleanflight (sparky, cc3d, acro naze, naze, afromini, flip32, flip32+, cjmcu, chebuzz f3, stm32f3discovery, naze32pro, etc)

The firmware source code can be downloaded from here
The newest binary firmware image is available here

Latest CP210x Drivers can be downloaded from here
" }, + "defaultContributingHead": { + "message": "Contributing" + }, + "defaultContributingText": { + "message": "If you would like to help make Cleanflight even better you can help in many ways, including:

" + }, "defaultChangelogHead": { "message": "Configurator - Changelog" }, diff --git a/js/gui.js b/js/gui.js index 89fab7d7..8e52424c 100644 --- a/js/gui.js +++ b/js/gui.js @@ -15,7 +15,8 @@ var GUI_control = function () { this.timeout_array = []; this.defaultAllowedTabsWhenDisconnected = [ 'landing', - 'firmware_flasher' + 'firmware_flasher', + 'help' ]; this.defaultAllowedTabsWhenConnected = [ 'adjustments', diff --git a/main.html b/main.html index e7afaf49..fb41a0eb 100755 --- a/main.html +++ b/main.html @@ -11,6 +11,7 @@ + @@ -57,6 +58,7 @@ + @@ -133,6 +135,7 @@
    • +
    diff --git a/main.js b/main.js index fa3d54b6..b2f1d4da 100755 --- a/main.js +++ b/main.js @@ -109,6 +109,9 @@ $(document).ready(function () { case 'firmware_flasher': TABS.firmware_flasher.initialize(content_ready); break; + case 'help': + TABS.help.initialize(content_ready); + break; case 'auxiliary': TABS.auxiliary.initialize(content_ready); diff --git a/tabs/help.css b/tabs/help.css new file mode 100644 index 00000000..a530bef9 --- /dev/null +++ b/tabs/help.css @@ -0,0 +1,64 @@ +.tab-help .left { + width: 60%; +} +.tab-help .right { + float: left; + + margin-left: 10px; + width: calc(40% - 10px); +} + +.tab-landing .section { + margin-bottom: 10px; +} + +.left .section:last-child, +.right .section:last-child { + margin-bottom: 0px; +} + +.section .title { + line-height: 20px; + + text-align: center; + font-weight: bold; + color: white; + + border-bottom: 1px solid silver; + background-color: #3f4241; +} + +.documentation { + height: 447px; + + border: 1px solid silver; +} +.documentation p { + padding: 5px; +} +.documentation p a { + font-weight: bold; +} +.documentation p a:hover { + text-decoration: underline; +} +.support { + height: 447px; + + border: 1px solid silver; +} +.support p { + padding: 5px; +} +.support p a { + font-weight: bold; +} +.support p a:hover { + text-decoration: underline; +} +.support .wrapper { + height: 426px; + + overflow-y: scroll; + overflow-x: hidden; +} diff --git a/tabs/help.html b/tabs/help.html new file mode 100644 index 00000000..b5270ff0 --- /dev/null +++ b/tabs/help.html @@ -0,0 +1,17 @@ +
    +
    +
    +
    +

    +
    +
    +
    +
    +
    +
    +

    +
    +
    + +
    +
    \ No newline at end of file diff --git a/tabs/help.js b/tabs/help.js new file mode 100644 index 00000000..53236897 --- /dev/null +++ b/tabs/help.js @@ -0,0 +1,21 @@ +'use strict'; + +TABS.help = {}; +TABS.help.initialize = function (callback) { + var self = this; + + if (GUI.active_tab != 'help') { + GUI.active_tab = 'help'; + googleAnalytics.sendAppView('help'); + } + + $('#content').load("./tabs/help.html", function () { + localize(); + + if (callback) callback(); + }); +}; + +TABS.help.cleanup = function (callback) { + if (callback) callback(); +}; \ No newline at end of file diff --git a/tabs/landing.css b/tabs/landing.css index 90143548..ce705507 100644 --- a/tabs/landing.css +++ b/tabs/landing.css @@ -7,11 +7,19 @@ margin-left: 10px; width: calc(40% - 10px); } + +.tab-landing .section { + margin-bottom: 10px; +} + +.left .section:last-child, +.right .section:last-child { + margin-bottom: 0px; +} + .tab-landing .optional_permissions { display: none; - margin-bottom: 10px; - border: 1px solid silver; } .tab-landing .optional_permissions .title { @@ -46,19 +54,32 @@ .tab-landing .optional_permissions a:hover { background-color: #dedcdc; } -.welcome { - height: 171px; - padding: 5px; - margin-bottom: 10px; +.welcome { + height: 207px; +} + +.contributing, +.welcome { + padding: 5px; border: 1px solid silver; } + +.contributing a, .welcome a { font-weight: bold; } +.contributing a:hover, .welcome a:hover { text-decoration: underline; } + +.contributing li { + list-style-type: disc; + list-style-position: initial; + margin-left: 20px; +} + .changelog { border: 1px solid silver; } @@ -88,13 +109,13 @@ .changelog .wrapper p { margin-bottom: 5px; } + .donate { height: 105px; - margin-bottom: 10px; - border: 1px solid silver; } -.donate .title { + +.section .title { line-height: 20px; text-align: center; @@ -117,19 +138,9 @@ } .tab-landing .sponsors { - height: 105px; + height: 254px; border: 1px solid silver; } -.tab-landing .sponsors .title { - line-height: 20px; - - text-align: center; - font-weight: bold; - color: white; - - border-bottom: 1px solid silver; - background-color: #3f4241; -} .tab-landing .sponsors p { padding: 5px; } @@ -139,57 +150,3 @@ .tab-landing .sponsors p a:hover { text-decoration: underline; } -.documentation { - height: 135px; - - border: 1px solid silver; -} -.documentation .title { - line-height: 20px; - - text-align: center; - font-weight: bold; - color: white; - - border-bottom: 1px solid silver; - background-color: #3f4241; -} -.documentation p { - padding: 5px; -} -.documentation p a { - font-weight: bold; -} -.documentation p a:hover { - text-decoration: underline; -} -.support { - height: 135px; - - border: 1px solid silver; -} -.support .title { - line-height: 20px; - - text-align: center; - font-weight: bold; - color: white; - - border-bottom: 1px solid silver; - background-color: #3f4241; -} -.support p { - padding: 5px; -} -.support p a { - font-weight: bold; -} -.support p a:hover { - text-decoration: underline; -} -.support .wrapper { - height: 114px; - - overflow-y: scroll; - overflow-x: hidden; -} diff --git a/tabs/landing.html b/tabs/landing.html index 37821ff8..1421c296 100644 --- a/tabs/landing.html +++ b/tabs/landing.html @@ -1,24 +1,18 @@
    -
    +

    -
    -
    -
    -
    -
    -
    - -
    +
    +
    +
    +

    +

    -
    -
    -
    -
    -
    +
    +
    +
    + +
    +
    +

    • MassiveRC
    @@ -39,19 +39,4 @@

    -
    -
    -
    -

    -
    -
    -
    -
    -
    -
    -

    -
    -
    - -
    \ No newline at end of file