OP-885 Added and replaced some artwork for Revolution board and other.

ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml

@@ -1561,6 +1561,17 @@
           <enableVbo>false</enableVbo>
         </data>
       </CC3D>
+      <Revolution>
+        <configInfo>
+          <locked>false</locked>
+          <version>0.0.0</version>
+        </configInfo>
+        <data>
+          <acFilename>%%DATAPATH%%models/boards/Revolution/revolution.3ds</acFilename>
+          <bgFilename>%%DATAPATH%%models/backgrounds/default_background.png</bgFilename>
+          <enableVbo>false</enableVbo>
+        </data>
+      </Revolution>
       <Easyquad__PCT__20X>
         <configInfo>
           <locked>false</locked>

ground/openpilotgcs/share/share.pro

@@ -9,7 +9,7 @@ equals(copydata, 1) {
    for(dir, DATACOLLECTIONS) {
        exists($$GCS_SOURCE_TREE/share/openpilotgcs/$$dir) {
            macx:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline()
-           win32:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline()
+           win32:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline()
            unix:data_copy.commands += $(MKDIR) $$targetPath(\"$$GCS_DATA_PATH/$$dir\") $$addNewline()
            unix:data_copy.commands += $(COPY_DIR) $$targetPath(\"$$GCS_SOURCE_TREE/share/openpilotgcs/$$dir\") $$targetPath(\"$$GCS_DATA_PATH/\") $$addNewline()
        }

ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp

@@ -95,7 +95,7 @@ void deviceWidget::populate()
         devicePic.load("");//TODO
         break;
     case 0x0301:
-        devicePic.load(":/uploader/images/pipx.png");
+        devicePic.load(":/uploader/images/gcs-board-oplink.png");
         break;
     case 0x0401:
         devicePic.load(":/uploader/images/gcs-board-cc.png");
@@ -103,7 +103,11 @@ void deviceWidget::populate()
     case 0x0402:
         devicePic.load(":/uploader/images/gcs-board-cc3d.png");
         break;
+    case 0x0903:
+        devicePic.load(":/uploader/images/gcs-board-revo.png");
+        break;
     default:
+        devicePic.load(""); //Clear
         break;
     }
     myDevice->gVDevice->scene()->addPixmap(devicePic);

ground/openpilotgcs/src/plugins/uploader/devicewidget.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>576</width>
+    <width>584</width>
     <height>500</height>
    </rect>
   </property>
@@ -24,12 +24,18 @@
        <layout class="QHBoxLayout" name="horizontalLayout_6">
         <item>
          <widget class="QGraphicsView" name="gVDevice">
-          <property name="maximumSize">
+          <property name="minimumSize">
            <size>
             <width>160</width>
             <height>160</height>
            </size>
           </property>
+          <property name="maximumSize">
+           <size>
+            <width>350</width>
+            <height>350</height>
+           </size>
+          </property>
           <property name="styleSheet">
            <string notr="true">background: transparent</string>
           </property>

ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp

@@ -59,7 +59,6 @@ void runningDeviceWidget::resizeEvent(QResizeEvent* event)
   */
 void runningDeviceWidget::populate()
 {
-
     ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
     UAVObjectUtilManager* utilMngr = pm->getObject<UAVObjectUtilManager>();
     int id = utilMngr->getBoardModel();
@@ -81,7 +80,7 @@ void runningDeviceWidget::populate()
         devicePic.load("");//TODO
         break;
     case 0x0301:
-        devicePic.load(":/uploader/images/pipx.png");
+        devicePic.load(":/uploader/images/gcs-board-oplink.png");
         break;
     case 0x0401:
         devicePic.load(":/uploader/images/gcs-board-cc.png");
@@ -89,7 +88,11 @@ void runningDeviceWidget::populate()
     case 0x0402:
         devicePic.load(":/uploader/images/gcs-board-cc3d.png");
         break;
+    case 0x0903:
+        devicePic.load(":/uploader/images/gcs-board-revo.png");
+        break;
     default:
+        devicePic.load(""); //Clear
         break;
     }
     myDevice->devicePicture->scene()->addPixmap(devicePic);
@@ -97,65 +100,33 @@ void runningDeviceWidget::populate()
     myDevice->devicePicture->fitInView(devicePic.rect(),Qt::KeepAspectRatio);
 
     QString serial = utilMngr->getBoardCPUSerial().toHex();
-     myDevice->CPUSerial->setText(serial);
+    myDevice->CPUSerial->setText(serial);
 
     QByteArray description = utilMngr->getBoardDescription();
     deviceDescriptorStruct devDesc;
-    if(UAVObjectUtilManager::descriptionToStructure(description,devDesc))
+    if(UAVObjectUtilManager::descriptionToStructure(description, devDesc)) {
-    {
+        if(devDesc.gitTag.startsWith("RELEASE",Qt::CaseSensitive)) {
-        if(devDesc.gitTag.startsWith("RELEASE",Qt::CaseSensitive))
+            myDevice->lblFWTag->setText(QString("Firmware tag: ") + devDesc.gitTag);
-        {
-            myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.gitTag);
             QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg"));
             myDevice->lblCertified->setPixmap(pix);
             myDevice->lblCertified->setToolTip(tr("Tagged officially released firmware build"));
 
-        }
+        } else {
-        else
+            myDevice->lblFWTag->setText(QString("Firmware tag: ") + devDesc.gitTag);
-        {
-            myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.gitTag);
             QPixmap pix = QPixmap(QString(":uploader/images/warning.svg"));
             myDevice->lblCertified->setPixmap(pix);
             myDevice->lblCertified->setToolTip(tr("Untagged or custom firmware build"));
         }
-        myDevice->lblGitCommitTag->setText("Git commit hash: "+devDesc.gitHash);
+        myDevice->lblGitCommitTag->setText("Git commit hash: " + devDesc.gitHash);
         myDevice->lblFWDate->setText(QString("Firmware date: ") + devDesc.gitDate.insert(4,"-").insert(7,"-"));
     }
     else
     {
-
+        myDevice->lblFWTag->setText(QString("Firmware tag: ") + QString(description).left(QString(description).indexOf(QChar(255))));
-        myDevice->lblFWTag->setText(QString("Firmware tag: ")+QString(description).left(QString(description).indexOf(QChar(255))));
         myDevice->lblGitCommitTag->setText("Git commit tag: Unknown");
         myDevice->lblFWDate->setText(QString("Firmware date: Unknown"));
         QPixmap pix = QPixmap(QString(":uploader/images/warning.svg"));
         myDevice->lblCertified->setPixmap(pix);
         myDevice->lblCertified->setToolTip(tr("Custom Firmware Build"));
     }
-    //status("Ready...", STATUSICON_INFO);
 }
-
-
-/**
-  Updates status message
-  */
-/*
-void runningDeviceWidget::status(QString str, StatusIcon ic)
-{
-    QPixmap px;
-    myDevice->statusLabel->setText(str);
-    switch (ic) {
-    case STATUSICON_RUNNING:
-        px.load(QString(":/uploader/images/system-run.svg"));
-        break;
-    case STATUSICON_OK:
-        px.load(QString(":/uploader/images/dialog-apply.svg"));
-        break;
-    case STATUSICON_FAIL:
-        px.load(QString(":/uploader/images/process-stop.svg"));
-        break;
-    default:
-        px.load(QString(":/uploader/images/gtk-info.svg"));
-    }
-    myDevice->statusIcon->setPixmap(px);
-}
-*/

ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>516</width>
+    <width>561</width>
-    <height>299</height>
+    <height>387</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -22,12 +22,18 @@
      <layout class="QHBoxLayout" name="horizontalLayout_2">
       <item>
        <widget class="QGraphicsView" name="devicePicture">
-        <property name="maximumSize">
+        <property name="minimumSize">
          <size>
           <width>160</width>
           <height>160</height>
          </size>
         </property>
+        <property name="maximumSize">
+         <size>
+          <width>350</width>
+          <height>350</height>
+         </size>
+        </property>
         <property name="styleSheet">
          <string notr="true">background: transparent</string>
         </property>
@@ -43,12 +49,21 @@
         <property name="horizontalScrollBarPolicy">
          <enum>Qt::ScrollBarAlwaysOff</enum>
         </property>
+        <property name="renderHints">
+         <set>QPainter::Antialiasing|QPainter::HighQualityAntialiasing|QPainter::SmoothPixmapTransform|QPainter::TextAntialiasing</set>
+        </property>
        </widget>
       </item>
       <item>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QLabel" name="lblBoardName">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
@@ -56,6 +71,12 @@
         </item>
         <item>
          <widget class="QLabel" name="lblDeviceID">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
@@ -63,6 +84,12 @@
         </item>
         <item>
          <widget class="QLabel" name="lblHWRev">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>TextLabel</string>
           </property>
@@ -72,6 +99,12 @@
          <layout class="QHBoxLayout" name="horizontalLayout">
           <item>
            <widget class="QLabel" name="lblCPU">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="text">
              <string>CPU Serial:</string>
             </property>
@@ -79,6 +112,12 @@
           </item>
           <item>
            <widget class="QLineEdit" name="CPUSerial">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="readOnly">
              <bool>true</bool>
             </property>
@@ -86,8 +125,34 @@
           </item>
          </layout>
         </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
        </layout>
       </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>

ground/openpilotgcs/src/plugins/uploader/uploader.qrc

@@ -16,5 +16,7 @@
         <file>images/gcs-board-cc.png</file>
         <file>images/gcs-board-cc3d.png</file>
         <file>images/pipx.png</file>
+        <file>images/gcs-board-oplink.png</file>
+        <file>images/gcs-board-revo.png</file>
     </qresource>
 </RCC>

ground/openpilotgcs/src/plugins/uploader/uploader.ui

@@ -175,7 +175,7 @@ halting a running board.</string>
       <property name="currentIndex">
        <number>0</number>
       </property>
-      <widget class="QWidget" name="tab">
+      <widget class="QWidget" name="defaultTab">
        <attribute name="title">
         <string>Mainboard</string>
        </attribute>
@@ -186,14 +186,14 @@ halting a running board.</string>
            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;To upgrade the firmware in your boards, proceed as follows:&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;To upgrade the firmware in your boards, proceed as follows:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Connect telemetry&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;- Connect telemetry&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- Once telemetry is running, press &amp;quot;Halt&amp;quot; above&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;- Once telemetry is running, press &amp;quot;Halt&amp;quot; above&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- You will get a list of devices.&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;- You will get a list of devices.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- You can then upload/download to/from each board as you wish&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;- You can then upload/download to/from each board as you wish&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;- You can resume operations by pressing &amp;quot;Boot&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;- You can resume operations by pressing &amp;quot;Boot&amp;quot;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
@@ -208,8 +208,8 @@ p, li { white-space: pre-wrap; }
        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </widget>
     </widget>

ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp

@@ -147,7 +147,7 @@ void UploaderGadgetWidget::onPhisicalHWConnect()
   Enables widget buttons if autopilot connected
   */
 void UploaderGadgetWidget::onAutopilotConnect(){
-    QTimer::singleShot(1000,this,SLOT(populate()));
+    QTimer::singleShot(1000, this, SLOT(populate()));
 }
 
 void UploaderGadgetWidget::populate()
@@ -175,6 +175,7 @@ void UploaderGadgetWidget::populate()
   Enables widget buttons if autopilot disconnected
   */
 void UploaderGadgetWidget::onAutopilotDisconnect(){
+
     m_config->haltButton->setEnabled(false);
     m_config->resetButton->setEnabled(false);
     m_config->bootButton->setEnabled(true);
@@ -188,7 +189,6 @@ void UploaderGadgetWidget::onAutopilotDisconnect(){
     }
 }
 
-
 /**
   Tell the mainboard to go to bootloader:
    - Send the relevant IAP commands