rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Added support for CopterCOntrol and PipX to the uploader gadget.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2433 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2011-01-15 15:54:04 +00:00 committed by edouard
parent f0b161f7b9
commit 33ccd49c04
5 changed files with 143 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/uploader/devicewidget.cpp
View File

@ -91,6 +91,12 @@ void deviceWidget::populate()
case 1:
devicePic->renderer()->load(QString(":/uploader/images/deviceID-1.svg"));
break;
case 21:
devicePic->renderer()->load(QString(":/uploader/images/deviceID-21.svg"));
break;
case 42:
devicePic->renderer()->load(QString(":/uploader/images/deviceID-42.svg"));
break;
case 69:
devicePic->renderer()->load(QString(":/uploader/images/deviceID-69.svg"));
break;

61
ground/src/plugins/uploader/images/deviceID-21.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 239 KiB

69
ground/src/plugins/uploader/images/deviceID-42.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 552 KiB

2
ground/src/plugins/uploader/uploader.qrc
View File

@ -7,5 +7,7 @@
<file>images/process-stop.svg</file>
<file>images/dialog-apply.svg</file>
<file>images/gtk-info.svg</file>
<file>images/deviceID-42.svg</file>
<file>images/deviceID-21.svg</file>
</qresource>
</RCC>

8
ground/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -316,11 +316,11 @@ void UploaderGadgetWidget::systemBoot()
clearLog();
m_config->bootButton->setEnabled(false);
if (currentStep != IAP_STATE_BOOTLOADER) {
// The board is now reset: we have to disconnect telemetry
// Suspend telemety & polling in case it is not done yet
Core::ConnectionManager *cm = Core::ICore::instance()->connectionManager();
cm->disconnectDevice();
cm->suspendPolling();
}
QString devName = m_config->telemetryLink->currentText();
log("Attempting to boot the system through " + devName + ".");
@ -344,8 +344,6 @@ void UploaderGadgetWidget::systemBoot()
log("Booting system...");
dfu->JumpToApp();
// Restart the polling thread
// The board is now reset: we have to disconnect telemetry
Core::ConnectionManager *cm = Core::ICore::instance()->connectionManager();
cm->resumePolling();
m_config->bootButton->setEnabled(true);
m_config->rescueButton->setEnabled(true);