diff --git a/artwork/GCS Icons/dialog-warning.svg b/artwork/GCS Icons/dialog-warning.svg new file mode 100644 index 000000000..8de454769 --- /dev/null +++ b/artwork/GCS Icons/dialog-warning.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flight/Modules/FirmwareIAP/firmwareiap.c b/flight/Modules/FirmwareIAP/firmwareiap.c index 395ed960f..cfb5d2e9a 100644 --- a/flight/Modules/FirmwareIAP/firmwareiap.c +++ b/flight/Modules/FirmwareIAP/firmwareiap.c @@ -100,7 +100,7 @@ int32_t FirmwareIAPInitialize() data.ArmReset=0; data.crc = 0; FirmwareIAPObjSet( &data ); - FirmwareIAPObjConnectCallback( &FirmwareIAPCallback ); + if(bdinfo->magic==PIOS_BOARD_INFO_BLOB_MAGIC) FirmwareIAPObjConnectCallback( &FirmwareIAPCallback ); return 0; } diff --git a/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c b/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c index 311f1d623..2eee44859 100644 --- a/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c +++ b/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c @@ -30,8 +30,6 @@ /*! * \defgroup light Lights */ -/*! - /*! * \ingroup light diff --git a/ground/openpilotgcs/src/plugins/config/ahrs.ui b/ground/openpilotgcs/src/plugins/config/ahrs.ui index e41c73afd..a9ad4ca32 100644 --- a/ground/openpilotgcs/src/plugins/config/ahrs.ui +++ b/ground/openpilotgcs/src/plugins/config/ahrs.ui @@ -110,7 +110,6 @@ - diff --git a/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp b/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp index 1678e64a5..f965b5ad3 100644 --- a/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp +++ b/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp @@ -46,23 +46,23 @@ HITLWidget::HITLWidget(QWidget *parent) : QWidget(parent), simulator(0) { - widget = new Ui_HITLWidget(); - widget->setupUi(this); + widget = new Ui_HITLWidget(); + widget->setupUi(this); widget->startButton->setEnabled(true); widget->stopButton->setEnabled(false); greenColor = "rgb(35, 221, 35)"; - strAutopilotDisconnected = " Autopilot disconnected "; - strSimulatorDisconnected = " Simulator disconnected "; - strAutopilotConnected = " Autopilot connected "; - strSimulatorConnected = " Simulator connected "; + strAutopilotDisconnected = " Autopilot OFF "; + strSimulatorDisconnected = " Simulator OFF "; + strAutopilotConnected = " Autopilot ON "; + strSimulatorConnected = " Simulator ON "; widget->apLabel->setText(strAutopilotDisconnected); widget->simLabel->setText(strSimulatorDisconnected); - connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked())); - connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked())); + connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked())); + connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked())); connect(widget->buttonClearLog, SIGNAL(clicked()), this, SLOT(buttonClearLogClicked())); } @@ -188,10 +188,9 @@ void HITLWidget::buttonClearLogClicked() void HITLWidget::onAutopilotConnect() { - widget->simLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor)); - + widget->apLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor)); widget->apLabel->setText(strAutopilotConnected); - qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation"); + qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation"); } void HITLWidget::onAutopilotDisconnect() @@ -214,5 +213,3 @@ void HITLWidget::onSimulatorDisconnect() widget->simLabel->setText(" " + simulator->Name() +" disconnected "); qxtLog->info(QString("HITL: %1 disconnected").arg(simulator->Name())); } - - diff --git a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui index 3d6d77045..b3f48432a 100644 --- a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui +++ b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui @@ -31,7 +31,7 @@ Sound Collection - + 10 diff --git a/ground/openpilotgcs/src/plugins/uploader/devicedescriptorstruct.h b/ground/openpilotgcs/src/plugins/uploader/devicedescriptorstruct.h index 1304127e1..037ecede0 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicedescriptorstruct.h +++ b/ground/openpilotgcs/src/plugins/uploader/devicedescriptorstruct.h @@ -14,16 +14,16 @@ public: { switch (id | 0x0011) { case 0x0111://MB - return QString("Board name: OpenPilot MainBoard"); + return QString("OpenPilot MainBoard"); break; case 0x0311://PipX - return QString("Board name: PipXtreame"); + return QString("PipXtreame"); break; case 0x0411://Coptercontrol - return QString("Board name: CopterControl"); + return QString("CopterControl"); break; case 0x0211://INS - return QString("Board name: OpenPilot INS"); + return QString("OpenPilot INS"); break; default: return QString(""); diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp index 7751ee416..a679bbb1b 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp @@ -82,16 +82,16 @@ QString deviceWidget::idToBoardName(int id) { switch (id | 0x0011) { case 0x0111://MB - return QString("Board name: OpenPilot MainBoard"); + return QString("OpenPilot MainBoard"); break; case 0x0311://PipX - return QString("Board name: PipXtreame"); + return QString("PipXtreme"); break; case 0x0411://Coptercontrol - return QString("Board name: CopterControl"); + return QString("CopterControl"); break; case 0x0211://INS - return QString("Board name: OpenPilot INS"); + return QString("OpenPilot INS"); break; default: return QString(""); @@ -141,7 +141,7 @@ void deviceWidget::populate() myDevice->lblAccess->setText(QString("Flash access: ") + QString(r ? "R" : "-") + QString(w ? "W" : "-")); myDevice->lblMaxCode->setText(QString("Max code size: ") +QString::number(m_dfu->devices[deviceID].SizeOfCode)); - myDevice->lblCRC->setText(QString("Firmware CRC: ") + QString::number(m_dfu->devices[deviceID].FW_CRC)); + myDevice->lblCRC->setText(QString::number(m_dfu->devices[deviceID].FW_CRC)); myDevice->lblBLVer->setText(QString("BL version: ") + QString::number(m_dfu->devices[deviceID].BL_Version)); int size=((OP_DFU::device)m_dfu->devices[deviceID]).SizeOfDesc; m_dfu->enterDFU(deviceID); @@ -182,8 +182,8 @@ bool deviceWidget::populateBoardStructuredDescription(QByteArray desc) { if(UploaderGadgetWidget::descriptionToStructure(desc,&onBoardDescrition)) { - myDevice->lblGitTag->setText("Git commit tag: "+onBoardDescrition.gitTag); - myDevice->lblBuildDate->setText(QString("Firmware date: ") + onBoardDescrition.buildDate); + myDevice->lblGitTag->setText(onBoardDescrition.gitTag); + myDevice->lblBuildDate->setText(onBoardDescrition.buildDate); if(onBoardDescrition.description.startsWith("release",Qt::CaseInsensitive)) { myDevice->lblDescription->setText(QString("Firmware tag: ")+onBoardDescrition.description); @@ -194,7 +194,7 @@ bool deviceWidget::populateBoardStructuredDescription(QByteArray desc) } else { - myDevice->lblDescription->setText(QString("Firmware tag: ")+onBoardDescrition.description+QString(" (beta or custom build)")); + myDevice->lblDescription->setText(onBoardDescrition.description); QPixmap pix = QPixmap(QString(":uploader/images/warning.svg")); myDevice->lblCertified->setPixmap(pix); myDevice->lblCertified->setToolTip(tr("Custom Firmware Build")); @@ -212,11 +212,11 @@ bool deviceWidget::populateLoadedStructuredDescription(QByteArray desc) { if(UploaderGadgetWidget::descriptionToStructure(desc,&LoadedDescrition)) { - myDevice->lblGitTagL->setText("Git commit tag: "+LoadedDescrition.gitTag); - myDevice->lblBuildDateL->setText(QString("Firmware date: ") + LoadedDescrition.buildDate); + myDevice->lblGitTagL->setText(LoadedDescrition.gitTag); + myDevice->lblBuildDateL->setText( LoadedDescrition.buildDate); if(LoadedDescrition.description.startsWith("release",Qt::CaseInsensitive)) { - myDevice->lblDescritpionL->setText(QString("Firmware tag: ")+LoadedDescrition.description); + myDevice->lblDescritpionL->setText(LoadedDescrition.description); myDevice->description->setText(LoadedDescrition.description); QPixmap pix = QPixmap(QString(":uploader/images/application-certificate.svg")); myDevice->lblCertifiedL->setPixmap(pix); @@ -224,7 +224,7 @@ bool deviceWidget::populateLoadedStructuredDescription(QByteArray desc) } else { - myDevice->lblDescritpionL->setText(QString("Firmware tag: ")+LoadedDescrition.description+QString(" (beta or custom build)")); + myDevice->lblDescritpionL->setText(LoadedDescrition.description); myDevice->description->setText(LoadedDescrition.description); QPixmap pix = QPixmap(QString(":uploader/images/warning.svg")); myDevice->lblCertifiedL->setPixmap(pix); @@ -303,8 +303,8 @@ void deviceWidget::loadFirmware() myDevice->youdont->setChecked(false); QByteArray desc = loadedFW.right(100); QPixmap px; - myDevice->lblCRCL->setText(QString("FW CRC: ") + QString::number(DFUObject::CRCFromQBArray(loadedFW,m_dfu->devices[deviceID].SizeOfCode))); - myDevice->lblFirmwareSizeL->setText(QString("Firmware size: ")+QVariant(loadedFW.length()).toString()+ QString(" bytes")); + myDevice->lblCRCL->setText( QString::number(DFUObject::CRCFromQBArray(loadedFW,m_dfu->devices[deviceID].SizeOfCode))); + //myDevice->lblFirmwareSizeL->setText(QString("Firmware size: ")+QVariant(loadedFW.length()).toString()+ QString(" bytes")); if (populateLoadedStructuredDescription(desc)) { myDevice->youdont->setChecked(true); @@ -312,7 +312,7 @@ void deviceWidget::loadFirmware() myDevice->groupCustom->setVisible(false); if(myDevice->lblCRC->text()==myDevice->lblCRCL->text()) { - myDevice->statusLabel->setText(tr("The loaded firmware maches the firmware on the board. You shouldn't upload it")); + myDevice->statusLabel->setText(tr("The loaded firmware the same as on the board. You should not upload it")); px.load(QString(":/uploader/images/warning.svg")); } else if(myDevice->lblDevName->text()!=myDevice->lblBrdNameL->text()) @@ -322,7 +322,7 @@ void deviceWidget::loadFirmware() } else if(QDateTime::fromString(onBoardDescrition.buildDate)>QDateTime::fromString(LoadedDescrition.buildDate)) { - myDevice->statusLabel->setText(tr("The loaded firmware is older then the firmware on the board. You shouldn't upload it")); + myDevice->statusLabel->setText(tr("The loaded firmware is older than the firmware on the board. You should not upload it")); px.load(QString(":/uploader/images/warning.svg")); } else if(!LoadedDescrition.description.startsWith("release",Qt::CaseInsensitive)) @@ -332,13 +332,13 @@ void deviceWidget::loadFirmware() } else { - myDevice->statusLabel->setText(tr("Everything seems OK. You should upload the loaded firmware by pressing 'upload'")); + myDevice->statusLabel->setText(tr("Everything seems OK. You should upload the loaded firmware by pressing 'Flash'")); px.load(QString(":/uploader/images/gtk-info.svg")); } } else { - myDevice->statusLabel->setText(tr("The loaded firmware was not packaged with a compatible format. You shouldn't' upload it, if you know what you are doing and still want to upload it confirm it by checking the checkbox bellow")); + myDevice->statusLabel->setText(tr("The loaded firmware was not packaged with the OpenPilot format. You should not upload it unless you know what you are doing.")); px.load(QString(":/uploader/images/warning.svg")); myDevice->youdont->setChecked(false); myDevice->youdont->setVisible(true); diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.ui b/ground/openpilotgcs/src/plugins/uploader/devicewidget.ui index 0543bcbc9..6f7ed132f 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.ui +++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.ui @@ -6,8 +6,8 @@ 0 0 - 516 - 582 + 576 + 500 @@ -33,86 +33,114 @@ background: transparent + + QFrame::NoFrame + - + - - - lblDevName - - + + + + + + + lblDevName + + + + + + + DeviceID + + + + + + + lblHWRev + + + + + + + RW + + + + + + + BL Version + + + + + + + MaxCodeSize + + + + + + + + + + + Loads the firmware + + + Load... + + + + + + + I know what I'm doing + + + true + + + + + + + false + + + Update the firmware on this board. + + + Flash + + + + + + + Download the current board firmware to your computer + + + Retrieve... + + + + + + - - - DeviceID - - - - - - - lblHWRev - - - - - - - RW - - - - - - - BL Version - - - - - - - MaxCodeSize - - - - - - - - - - - Loads the firmware - - - Open - - - - - - - false - - - Update the firmware on this board. - - - Flash - - - - - - - Download the current board firmware to your computer - - - Retrieve... + + + 0 @@ -120,13 +148,6 @@ - - - - 0 - - - @@ -160,149 +181,211 @@ - - - - I know what I'm doing - - - true - - - - - - Firmware currently on the device - - - - + + + + + Firmware: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + - + + + Board name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Description: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Build date: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + GIT Tag: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + CRC: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + On Device + + + + - - - lblBrdName - - + + + + + lblBrdName + + + + + + + lblDescription + + + + + + + lblBuildDate + + + + + + + lblGitTag + + + + + + + lblCRC + + + + - + - lblDescription + lblCertified - - - - - - lblBuildDate - - - - - - - lblGitTag - - - - - - - lblCRC + + false - - - - lblCertified - - - false - - - - - - - - - - - true - - - Loaded Firmware - - - - + + + + + + true + + + Loaded + + - + - - - lblBrdName - - + + + + + lblBrdName + + + + + + + lblDescritpionL + + + + + + + lblBuildDate + + + + + + + lblGitTag + + + + + + + lblCRC + + + + - + - lblDescritpionL - - - - - - - lblBuildDate - - - - - - - lblGitTag - - - - - - - lblCRC - - - - - - - lblFirmwareSizeL + lblCertifiedL - - - - lblCertifiedL - - - - - - + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + diff --git a/ground/openpilotgcs/src/plugins/uploader/images/warning.svg b/ground/openpilotgcs/src/plugins/uploader/images/warning.svg index cd684c4e1..8de454769 100644 --- a/ground/openpilotgcs/src/plugins/uploader/images/warning.svg +++ b/ground/openpilotgcs/src/plugins/uploader/images/warning.svg @@ -1,102 +1,35 @@ - - -image/svg+xml - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp index 9b56f2dfb..e45dbad83 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.cpp @@ -37,8 +37,10 @@ runningDeviceWidget::runningDeviceWidget(QWidget *parent) : // Initialization of the Device icon display myDevice->devicePicture->setScene(new QGraphicsScene(this)); + /* QPixmap pix = QPixmap(QString(":uploader/images/view-refresh.svg")); myDevice->statusIcon->setPixmap(pix); + */ } @@ -104,7 +106,7 @@ void runningDeviceWidget::populate() myDevice->devicePicture->fitInView(devicePic,Qt::KeepAspectRatio); QString serial = utilMngr->getBoardCPUSerial().toHex(); - myDevice->lblCPU->setText(QString("CPU serial number: "+serial)); + myDevice->CPUSerial->setText(serial); QByteArray description = utilMngr->getBoardDescription(); deviceDescriptorStruct devDesc; @@ -120,7 +122,7 @@ void runningDeviceWidget::populate() } else { - myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.description+QString(" (beta or custom build)")); + myDevice->lblFWTag->setText(QString("Firmware tag: ")+devDesc.description); QPixmap pix = QPixmap(QString(":uploader/images/warning.svg")); myDevice->lblCertified->setPixmap(pix); myDevice->lblCertified->setToolTip(tr("Custom Firmware Build")); @@ -138,13 +140,14 @@ void runningDeviceWidget::populate() myDevice->lblCertified->setPixmap(pix); myDevice->lblCertified->setToolTip(tr("Custom Firmware Build")); } - status("Ready...", STATUSICON_INFO); + //status("Ready...", STATUSICON_INFO); } /** Updates status message */ +/* void runningDeviceWidget::status(QString str, StatusIcon ic) { QPixmap px; @@ -164,3 +167,4 @@ void runningDeviceWidget::status(QString str, StatusIcon ic) } myDevice->statusIcon->setPixmap(px); } +*/ diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h index a1b77b3ba..05dd7f0dc 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.h @@ -55,7 +55,7 @@ private: Ui_runningDeviceWidget *myDevice; int deviceID; QGraphicsSvgItem *devicePic; - void status(QString str, StatusIcon ic); + //void status(QString str, StatusIcon ic); signals: diff --git a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui index 1f69d407f..c01332629 100644 --- a/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui +++ b/ground/openpilotgcs/src/plugins/uploader/runningdevicewidget.ui @@ -7,7 +7,7 @@ 0 0 516 - 253 + 299 @@ -34,6 +34,15 @@ QFrame::NoFrame + + QFrame::Plain + + + Qt::ScrollBarAlwaysOff + + + Qt::ScrollBarAlwaysOff + @@ -60,11 +69,22 @@ - - - TextLabel - - + + + + + CPU Serial: + + + + + + + true + + + + @@ -119,40 +139,6 @@ - - - - - - - - ic - - - - - - - - 0 - 0 - - - - - 75 - true - - - - Status - - - - - - -