Moved MSC button to blackbox tab.

locales/en/messages.json

@@ -610,18 +610,12 @@
     "initialSetupButtonRebootBootloader": {
         "message": "Activate Boot Loader / DFU"
     },
-    "initialSetupButtonRebootMsc": {
-        "message": "Activate Mass Storage Device Mode"
-    },
     "initialSetupBackupRestoreText": {
         "message": "<strong>Backup</strong> your configuration in case of an accident, <strong>CLI</strong> settings are <span class=\"message-negative\">not</span> included - use the command 'diff all' in CLI for this."
     },
     "initialSetupRebootBootloaderText": {
         "message": "Reboot into <strong>boot loader / DFU</strong> mode."
     },
-    "initialSetupRebootMscText": {
-        "message": "Reboot into <strong>mass storage device (MSC)</strong> mode. Once activated, the onboard flash or SD card on your flight controller will be recognised as a storage device by your computer, and allow you to download your log files. Eject and power cycel your flight controller to leave mass storage device mode."
-    },
     "initialSetupBackupSuccess": {
         "message": "Backup saved <span class=\"message-positive\">successfully</span>"
     },
@@ -3597,6 +3591,18 @@
     "onboardLoggingOnboardSDCard": {
         "message": "Onboard SD card"
     },
+    "onboardLoggingMsc": {
+        "message": "Mass Storage Mode"
+    },
+    "onboardLoggingMscNote": {
+        "message": "Reboot into <strong>mass storage device (MSC)</strong> mode. Once activated, the onboard flash or SD card on your flight controller will be recognised as a storage device by your computer, and allow you to download your log files. Eject and power cycel your flight controller to leave mass storage device mode."
+    },
+    "onboardLoggingRebootMscText": {
+        "message": "Activate Mass Storage Device Mode"
+    },
+    "onboardLoggingMscNotReady": {
+        "message": "Mass storage mode can not be activated because the storage device is not ready."
+    },
     "dialogConfirmResetTitle": {
         "message": "Confirm"
     },

src/css/tabs/onboard_logging.css

@@ -206,6 +206,22 @@
     display: none;
 }
 
+.require-msc-supported {
+    display: none;
+}
+
+.tab-onboard_logging.msc-supported .require-msc-supported {
+    display: block;
+}
+
+.require-msc-not-ready {
+    display: none;
+}
+
+.tab-onboard_logging.msc-not-ready .require-msc-not-ready {
+    display: block;
+}
+
 @media only screen and (max-width: 1055px) , only screen and (max-device-width: 1055px) {
     .tab-onboard_logging table thead tr:first-child {
         font-size: 12px;
@@ -300,4 +316,4 @@
     pointer-events: none;
     text-shadow: none;
     opacity: 0.5;
-}
+}

src/js/tabs/onboard_logging.js

@@ -145,6 +145,20 @@ TABS.onboard_logging.initialize = function (callback) {
                     $("div.blackboxRate").show();
                 }
             }).change();
+
+            if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
+                if (SDCARD.supported || DATAFLASH.supported) {
+
+                    $(".tab-onboard_logging")
+                        .toggleClass("msc-supported", true);
+
+                    $('a.onboardLoggingRebootMsc').click(function () {
+                        var buffer = [];
+                        buffer.push(2);
+                        MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
+                    });
+                }
+            }
             
             update_html();
             
@@ -296,6 +310,18 @@ TABS.onboard_logging.initialize = function (callback) {
             .toggleClass("sdcard-error", SDCARD.state === MSP.SDCARD_STATE_FATAL)
             .toggleClass("sdcard-initializing", SDCARD.state === MSP.SDCARD_STATE_CARD_INIT || SDCARD.state === MSP.SDCARD_STATE_FS_INIT)
             .toggleClass("sdcard-ready", SDCARD.state === MSP.SDCARD_STATE_READY);
+
+        if (semver.gte(CONFIG.apiVersion, "1.40.0")) {
+            var mscIsReady = (DATAFLASH.totalSize > 0) || (SDCARD.state === MSP.SDCARD_STATE_READY);
+            $(".tab-onboard_logging")
+                .toggleClass("msc-not-ready", !mscIsReady);
+
+            if (!mscIsReady) {
+                $('a.onboardLoggingRebootMsc').addClass('disabled');
+            } else {
+                $('a.onboardLoggingRebootMsc').removeClass('disabled');
+            }
+        }
         
         switch (SDCARD.state) {
             case MSP.SDCARD_STATE_NOT_PRESENT:

src/js/tabs/setup.js

@@ -73,15 +73,8 @@ TABS.setup.initialize = function (callback) {
                 buffer.push(1);
                 MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
             });
-
-            $('a.rebootMsc').click(function () {
-                var buffer = [];
-                buffer.push(2);
-                MSP.send_message(MSPCodes.MSP_SET_REBOOT, buffer, false);
-            });
         } else {
             $('.initialSetupRebootBootloader').hide();
-            $('.initialSetupRebootMsc').hide();
         }
 
         // UI Hooks

src/tabs/onboard_logging.html

@@ -133,6 +133,23 @@
                     </div>
                 </div>
             </div>
+            <div class="gui_box grey require-msc-supported">
+                <div class="gui_box_titlebar" align="left">
+                    <div class="spacer_box_title" i18n="onboardLoggingMsc">
+                    </div>
+                </div>
+                <div class="spacer_box">
+                    <div class="require-msc-supported">
+                        <p i18n="onboardLoggingMscNote"></p>
+
+                        <div>
+                            <a class="require-msc-ready regular-button onboardLoggingRebootMsc" href="#" i18n="onboardLoggingRebootMscText"></a>
+                        </div>
+                    </div>
+
+                    <p class="require-msc-not-ready" i18n="onboardLoggingMscNotReady"></p>
+                </div>
+            </div>
         </div>
     </div>
 </div>

src/tabs/setup.html

@@ -49,9 +49,6 @@
                     <div class="default_btn initialSetupRebootBootloader">
                         <a class="rebootBootloader" href="#" i18n="initialSetupButtonRebootBootloader"></a>
                     </div>
-                    <div class="default_btn intialSetupRebootMsc">
-                        <a class="rebootMsc" href="#" i18n="initialSetupButtonRebootMsc"></a>
-                    </div>
                 </div>
             </div>
             <div class="threefourth_right setupinfo">
@@ -70,9 +67,6 @@
                 <div class="cell_setup initialSetupRebootBootloader">
                     <span i18n="initialSetupRebootBootloaderText"></span>
                 </div>
-                <div class="cell_setup intialSetupRebootMsc">
-                    <span i18n="initialSetupRebootMscText"></span>
-                </div>
             </div>
         </div>
         <div class="modelwrapper"></div>