rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup

Browse Source
This commit is contained in:
Mathieu Rondonneau 2013-06-03 07:52:53 -07:00
commit b5b48d3bf0
16 changed files with 102 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
WHATSNEW.txt
View File

@ -112,6 +112,9 @@ Important Release Notes:
paired radios and click Save. After USB unplugging and plugging back your OPLink should show
"Connected", and you can continue with configuration.
- Don't set Revo modem or OPLinkMini output power to high values without antenna connected,
this can damage the hardware.
Flight code changes:
- initial version of Revo code;
- initial version of OPLinkMini code;

9
flight/Project/Windows USB/OpenPilot-CDC.inf
View File

@ -10,13 +10,15 @@ DriverVer = 10/15/2009,1.0.0.0
[DeviceList.NTx86]
%CopterControl% = DriverInstall,USB\VID_20A0&PID_415b&MI_00
%OPLink% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00
%OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00
[DeviceList.NTamd64]
%CopterControl% = DriverInstall,USB\VID_20A0&PID_415b&MI_00
%OPLink% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%Revolution% = DriverInstall,USB\VID_20A0&PID_415e&MI_00
%OPLinkMini% = DriverInstall,USB\VID_20A0&PID_415c&MI_00
%OPLink1W% = DriverInstall,USB\VID_20A0&PID_4195&MI_00
[DriverInstall]
include = mdmcpq.inf
@ -34,5 +36,6 @@ HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Strings]
ProviderName = "OpenPilot"
CopterControl = "CopterControl Virtual COM Port"
OPLink = "OPLink Virtual COM Port"
Revolution = "Revolution Virtual COM Port"
OPLinkMini = "OPLinkMini Virtual COM Port"
OPLink1W = "OPLink1W Virtual COM Port"

6
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_de.ts
View File

@ -14033,12 +14033,12 @@ or power cycle to force a board reset.</source>
<message>
<location line="-141"/>
<location line="+141"/>
<source>Please disconnect all openpilot boards</source>
<source>Please disconnect your OpenPilot board</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>Please connect the board (USB only!)</source>
<source>Please connect your OpenPilot board (USB only!)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -14048,7 +14048,7 @@ or power cycle to force a board reset.</source>
</message>
<message>
<location line="+16"/>
<source>Openpilot Uploader</source>
<source>OpenPilot Uploader</source>
<translation type="unfinished"></translation>
</message>
<message>

6
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_es.ts
View File

@ -14034,12 +14034,12 @@ or power cycle to force a board reset.</source>
<message>
<location line="-141"/>
<location line="+141"/>
<source>Please disconnect all openpilot boards</source>
<source>Please disconnect your OpenPilot board</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>Please connect the board (USB only!)</source>
<source>Please connect your OpenPilot board (USB only!)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -14049,7 +14049,7 @@ or power cycle to force a board reset.</source>
</message>
<message>
<location line="+16"/>
<source>Openpilot Uploader</source>
<source>OpenPilot Uploader</source>
<translation type="unfinished"></translation>
</message>
<message>

16
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
View File

@ -23,7 +23,7 @@
<message>
<location line="+38"/>
<source>OpenPilot GCS - Plugin loader messages</source>
<translation type="unfinished">Openpilot GCS - Messages du chargeur de modules complémentaires</translation>
<translation type="unfinished">OpenPilot GCS - Messages du chargeur de modules complémentaires</translation>
</message>
</context>
<context>
@ -158,12 +158,12 @@
<message>
<location line="+168"/>
<source>About &amp;OpenPilot GCS</source>
<translation>A propos d&apos;&amp;Openpilot GCS</translation>
<translation>A propos d&apos;&amp;OpenPilot GCS</translation>
</message>
<message>
<location line="+2"/>
<source>About &amp;OpenPilot GCS...</source>
<translation>A propos d&apos;&amp;Openpilot GCS...</translation>
<translation>A propos d&apos;&amp;OpenPilot GCS...</translation>
</message>
<message>
<location line="-164"/>
@ -415,7 +415,7 @@
<message>
<location filename="../../../src/plugins/coreplugin/versiondialog.cpp" line="+57"/>
<source>About OpenPilot GCS</source>
<translation>A propos d&apos;Openpilot GCS</translation>
<translation>A propos d&apos;OpenPilot GCS</translation>
</message>
<message>
<location line="+27"/>
@ -12844,7 +12844,7 @@ p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; 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;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;Sélection du type de véhicule&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; font-size:12pt; font-weight:600;&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;&lt;span style=&quot; font-size:10pt;&quot;&gt;Pour continuer, l&apos;assistant a besoin de connaître sur quel type de véhicule la carte Openpilot va être utilisée. Cette étape est cruciale car une grande partie de la configuration qui suit est spécifique au type de véhicule.&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;&lt;span style=&quot; font-size:10pt;&quot;&gt;Pour continuer, l&apos;assistant a besoin de connaître sur quel type de véhicule la carte OpenPilot va être utilisée. Cette étape est cruciale car une grande partie de la configuration qui suit est spécifique au type de véhicule.&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;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;&lt;span style=&quot; font-size:10pt;&quot;&gt;Allez-y et sélectionnez le type de véhicule pour lequel vous souhaitez créer une configuration.&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; font-size:10pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
@ -14471,12 +14471,12 @@ or power cycle to force a board reset.</source>
<message>
<location line="-141"/>
<location line="+141"/>
<source>Please disconnect all openpilot boards</source>
<source>Please disconnect your OpenPilot board</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>Please connect the board (USB only!)</source>
<source>Please connect your OpenPilot board (USB only!)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -14486,7 +14486,7 @@ or power cycle to force a board reset.</source>
</message>
<message>
<location line="+16"/>
<source>Openpilot Uploader</source>
<source>OpenPilot Uploader</source>
<translation type="unfinished"></translation>
</message>
<message>

6
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_ru.ts
View File

@ -14056,12 +14056,12 @@ or power cycle to force a board reset.</source>
<message>
<location line="-141"/>
<location line="+141"/>
<source>Please disconnect all openpilot boards</source>
<source>Please disconnect your OpenPilot board</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>Please connect the board (USB only!)</source>
<source>Please connect your OpenPilot board (USB only!)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -14071,7 +14071,7 @@ or power cycle to force a board reset.</source>
</message>
<message>
<location line="+16"/>
<source>Openpilot Uploader</source>
<source>OpenPilot Uploader</source>
<translation type="unfinished"></translation>
</message>
<message>

6
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_zh_CN.ts
View File

@ -14036,12 +14036,12 @@ or power cycle to force a board reset.</source>
<message>
<location line="-141"/>
<location line="+141"/>
<source>Please disconnect all openpilot boards</source>
<source>Please disconnect your OpenPilot board</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+12"/>
<source>Please connect the board (USB only!)</source>
<source>Please connect your OpenPilot board (USB only!)</source>
<translation type="unfinished"></translation>
</message>
<message>
@ -14051,7 +14051,7 @@ or power cycle to force a board reset.</source>
</message>
<message>
<location line="+16"/>
<source>Openpilot Uploader</source>
<source>OpenPilot Uploader</source>
<translation type="unfinished"></translation>
</message>
<message>

2
ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
cout << "| examples: |\n";
cout << "| |\n";
cout << "| program and verify device #0 |\n";
cout << "| OPUploadTool -p c:/OpenPilot.bin -w \"Openpilot Firmware\" -v -d 0 |\n";
cout << "| OPUploadTool -p c:/OpenPilot.bin -w \"OpenPilot Firmware\" -v -d 0 |\n";
cout << "| |\n";
cout << "| Perform a quick compare of FW in file with FW in device #1 |\n";
cout << "| OPUploadTool -ch c:/OpenPilot2.bin -d 2 |\n";

41
ground/openpilotgcs/src/plugins/coreplugin/CREDITS-utility.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html>
<head>
<title>CREDITS Utility</title>
<style>
body { margin: 40px;}
.hidden { display:none; }
</style>
</head>
<body>
<h1>Author Dialog authorModel Utility</h1>
<p>This utility will parse a \n delimited list of names and generate ListElement components for entry into the QML model located in /qml/AuthorsModel.qml.</p>
<div class="output"></div>
<form onSubmit="javascript:handleForm($('.authors').val()); return false;">
<textarea class="authors" rows="30"></textarea>
<button type="submit" class="btn">Generate</button>
</form>
<script src="http://code.jquery.com/jquery-latest.js"></script>
<script>
function handleForm(str){
console.log(str);
var lines = str.split(/\n/);
var texts = [];
$('<div class="alert-block alert-info"><strong>Instructions: </strong>Cut/Paste the ListElements below into /qml/AuthorsModel.qml</div><br>').appendTo('.output');
for (var i=0; i < lines.length; i++) {
// only push this line if it contains a non whitespace character.
if (/\S/.test(lines[i])) {
texts.push($.trim(lines[i]));
}
//Make string to append to output
var listelement = '<p>ListElement { name: "' + texts[i] + '" }</p>';
$(listelement).appendTo('.output');
}
$('button').detach();
$('.authors').detach();
}
</script>
</body>
</html

5
ground/openpilotgcs/src/plugins/coreplugin/CREDITS.html
View File

@ -56,7 +56,9 @@ Dmytro Poplavskiy
Eric Price
Richard Querin
Randy Ram
Philippe Renon
Laurent Ribon
Mathieu Rondonneau
Julien Rouviere
Jackson Russell
Zik Saleeba
@ -69,8 +71,10 @@ Dr. Erhard Siegl
Mike Smith
Alex Sowa
Pete Stapley
Vova Starikh
Rowan Taubitz
Andrew Thoms
Philippe Vanhaesendonck
Jasper van Loenen
Vassilis Varveropoulos
Kevin Vertucio
@ -79,6 +83,7 @@ Brian Webb
Justin Welander
Mat Wellington
Kendal Wells
David Willis
Dmitriy Zaitsev
</pre>
</body>

10
ground/openpilotgcs/src/plugins/coreplugin/qml/AuthorsModel.qml
View File

@ -104,9 +104,13 @@ ListModel {
ListElement{ name:"Richard Querin" }
ListElement{ name:"Randy Ram" }
ListElement{ name:"Philippe Renon" }
ListElement{ name:"Laurent Ribon" }
ListElement{ name:"Mathieu Rondonneau" }
ListElement{ name:"Julien Rouviere" }
ListElement{ name:"Jackson Russell" }
@ -130,11 +134,15 @@ ListModel {
ListElement{ name:"Alex Sowa" }
ListElement{ name:"Pete Stapley" }
ListElement{ name:"Vova Starikh" }
ListElement{ name:"Rowan Taubitz" }
ListElement{ name:"Andrew Thoms" }
ListElement{ name:"Philippe Vanhaesendonck" }
ListElement{ name:"Jasper van Loenen" }
ListElement{ name:"Vassilis Varveropoulos" }
@ -151,5 +159,7 @@ ListModel {
ListElement{ name:"Kendal Wells" }
ListElement { name: "David Willis" }
ListElement{ name:"Dmitriy Zaitsev" }
}

2
ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
View File

@ -70,7 +70,7 @@ void AutoUpdatePage::updateStatus(uploader::AutoUpdateStep status, QVariant valu
break;
case uploader::SUCCESS:
enableButtons(true);
ui->statusLabel->setText("Board Updated, please press the 'next' button below");
ui->statusLabel->setText("Board updated, please press 'Next' to continue");
break;
case uploader::FAILURE:
getWizard()->setWindowFlags(getWizard()->windowFlags() | Qt::WindowStaysOnTopHint);

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

@ -541,7 +541,7 @@ bool UploaderGadgetWidget::autoUpdate()
connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
while (USBMonitor::instance()->availableDevices(0x20a0, -1, -1, -1).length() > 0) {
emit autoUpdateSignal(WAITING_DISCONNECT, QVariant());
if (QMessageBox::warning(this, tr("OpenPilot Uploader"), tr("Please disconnect all openpilot boards"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
if (QMessageBox::warning(this, tr("OpenPilot Uploader"), tr("Please disconnect your OpenPilot board"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
emit autoUpdateSignal(FAILURE, QVariant());
return false;
}
@ -684,7 +684,7 @@ void UploaderGadgetWidget::systemRescue()
log("**********************************************************");
log("You will be prompted to first connect USB, then system power");
if (USBMonitor::instance()->availableDevices(0x20a0, -1, -1, -1).length() > 0) {
if (QMessageBox::warning(this, tr("OpenPilot Uploader"), tr("Please disconnect all openpilot boards"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
if (QMessageBox::warning(this, tr("OpenPilot Uploader"), tr("Please disconnect your OpenPilot board"), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Cancel) {
m_config->rescueButton->setEnabled(true);
return;
}
@ -695,7 +695,7 @@ void UploaderGadgetWidget::systemRescue()
log("** Follow those instructions to attempt a system rescue **");
log("**********************************************************");
log("You will be prompted to first connect USB, then system power");
m_progress = new QProgressDialog(tr("Please connect the board (USB only!)"), tr("Cancel"), 0, 20);
m_progress = new QProgressDialog(tr("Please connect your OpenPilot board (USB only!)"), tr("Cancel"), 0, 20);
QProgressBar *bar = new QProgressBar(m_progress);
bar->setFormat("Timeout");
m_progress->setBar(bar);
@ -710,7 +710,7 @@ void UploaderGadgetWidget::systemRescue()
if (!m_timer->isActive()) {
m_progress->close();
m_timer->stop();
QMessageBox::warning(this, tr("Openpilot Uploader"), tr("No board connection was detected!"));
QMessageBox::warning(this, tr("OpenPilot Uploader"), tr("No board connection was detected!"));
m_config->rescueButton->setEnabled(true);
return;
}

BIN
package/osx/OpenPilot.dmg
View File

Binary file not shown.

10
package/osx/package
View File

@ -13,6 +13,12 @@ VOL_NAME="OpenPilot"
rm -f "${TEMP_FILE}"
rm -f "${OUT_FILE}"
# if the file doesn't exist, try to create folder
if [ ! -f "/Volumes/${VOL_NAME}" ]
then
hdiutil unmount "/Volumes/${VOL_NAME}"
fi
hdiutil convert "${ROOT_DIR}/package/osx/OpenPilot.dmg" \
-format UDRW -o "${TEMP_FILE}"
device=$(hdiutil attach "${TEMP_FILE}" | \
@ -23,6 +29,10 @@ cp -a "${APP_PATH}" "/Volumes/${VOL_NAME}"
#ls "${FW_DIR}" | xargs -n 1 -I {} cp "${FW_DIR}/{}" "/Volumes/${VOL_NAME}/Firmware"
cp "${BUILD_DIR}/uavobject-synthetics/matlab/OPLogConvert.m" "/Volumes/${VOL_NAME}/Utilities"
cp "${ROOT_DIR}/WHATSNEW.txt" "/Volumes/${VOL_NAME}"
cp "${ROOT_DIR}/README.txt" "/Volumes/${VOL_NAME}/Docs"
cp "${ROOT_DIR}/MILESTONES.txt" "/Volumes/${VOL_NAME}/Docs"
cp "${ROOT_DIR}/LICENSE.txt" "/Volumes/${VOL_NAME}/Docs"
cp "${ROOT_DIR}/GPLv3.txt" "/Volumes/${VOL_NAME}/Docs"
"${ROOT_DIR}/package/osx/libraries" \
"/Volumes/${VOL_NAME}/OpenPilot GCS.app" || exit 1

1
package/winx86/openpilotgcs.nsi
View File

@ -162,6 +162,7 @@ Section "Core files" InSecCore
File "${PROJECT_ROOT}\README.txt"
File "${PROJECT_ROOT}\WHATSNEW.txt"
File "${PROJECT_ROOT}\MILESTONES.txt"
File "${PROJECT_ROOT}\GPLv3.txt"
SectionEnd
; Copy GCS plugins