piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/opentx/opentx into next

Browse Source
This commit is contained in:
JivaroFAD
2015-05-25 21:08:45 +02:00
parent ed93edf8d9 ae833f98d0
commit 4af46ec8dc
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/process_flash.cpp
+23 -24
View File
@@ -197,12 +197,10 @@ void FlashProcess::analyseStandardError(const QString &text)
currStderrLine = currStderrLine.mid(nlPos+1);
}
if (text.contains("-E-") && !text.contains("-E- No receive file name")) {
if ((text.contains("-E-") && !text.contains("-E- No receive file name")) ||
text.contains("No DFU capable USB device found")) {
hasErrors = true;
}
if (text.contains("No DFU capable USB device found")) {
hasErrors = true;
}
}
void FlashProcess::onReadyReadStandardOutput()
@@ -221,39 +219,39 @@ void FlashProcess::onReadyReadStandardError()
void FlashProcess::errorWizard()
{
QString output=progress->getText(); // TODO = ui->plainTextEdit->toPlainText();
QString output = progress->getText();
if (output.contains("avrdude: Expected signature for")) { // wrong signature
int pos=output.indexOf("avrdude: Device signature = ");
bool fwexist=false;
QString DeviceStr="Unknown";
QString FwStr="";
int pos = output.indexOf("avrdude: Device signature = ");
bool fwexist = false;
QString DeviceStr = tr("unknown");
QString FwStr = "";
if (pos>0) {
QString DeviceId=output.mid(pos+28,8);
if (pos > 0) {
QString DeviceId = output.mid(pos+28, 8);
if (DeviceId=="0x1e9602") {
DeviceStr="Atmega 64";
FwStr="\n"+tr("ie: OpenTX for 9X board or OpenTX for 9XR board");
fwexist=true;
DeviceStr = "Atmega 64";
FwStr="\n" + tr("ie: OpenTX for 9X board or OpenTX for 9XR board");
fwexist = true;
}
else if (DeviceId=="0x1e9702") {
DeviceStr="Atmega 128";
FwStr="\n"+tr("ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip");
fwexist=true;
DeviceStr = "Atmega 128";
FwStr="\n" + tr("ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip");
fwexist = true;
}
else if (DeviceId=="0x1e9703") {
DeviceStr="Atmega 1280";
DeviceStr = "Atmega 1280";
}
else if (DeviceId=="0x1e9704") {
DeviceStr="Atmega 1281";
DeviceStr = "Atmega 1281";
}
else if (DeviceId=="0x1e9801") {
DeviceStr="Atmega 2560";
FwStr="\n"+tr("ie: OpenTX for Gruvin9X board");
DeviceStr = "Atmega 2560";
FwStr="\n" + tr("ie: OpenTX for Gruvin9X board");
fwexist = true;
}
else if (DeviceId=="0x1e9802") {
DeviceStr="Atmega 2561";
DeviceStr = "Atmega 2561";
}
}
if (fwexist==false) {
@@ -263,7 +261,8 @@ void FlashProcess::errorWizard()
Firmware *firmware = GetCurrentFirmware();
QMessageBox::warning(NULL, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->getName()));
}
} else if (output.contains("No DFU capable USB device found")){
}
else if (output.contains("No DFU capable USB device found")){
#if defined WIN32 || !defined __GNUC__
QMessageBox::warning(NULL, "Companion - Tip of the day", tr("Your radio does not seem connected to USB or the driver is not installed!!!\n\nPlease use ZADIG to properly install the driver."));
#else
@@ -298,6 +297,6 @@ void FlashProcess::onFinished(int code=0)
void FlashProcess::addReadFuses()
{
progress->addSeparator();
progress->addText(tr("FUSES: Low=%1 High=%2 Ext=%3").arg(lfuse,2,16,QChar('0')).arg(hfuse,2,16,QChar('0')).arg(efuse,2,16,QChar('0')));
progress->addText(tr("FUSES: Low=%1 High=%2 Ext=%3").arg(lfuse, 2, 16, QChar('0')).arg(hfuse, 2, 16, QChar('0')).arg(efuse, 2, 16, QChar('0')));
progress->addSeparator();
}
companion/src/simulation/simulatordialog-9x.ui
+6 -6
View File
@@ -1020,7 +1020,7 @@ QPushButton:checked {
</spacer>
</item>
<item row="2" column="0">
<widget class="myQDial" name="dial0">
<widget class="myQDial" name="pot0">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -1054,7 +1054,7 @@ QPushButton:checked {
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="dialValue0">
<widget class="QLabel" name="potValue0">
<property name="text">
<string notr="true">0 %</string>
</property>
@@ -1077,7 +1077,7 @@ QPushButton:checked {
</spacer>
</item>
<item row="5" column="0">
<widget class="myQDial" name="dial1">
<widget class="myQDial" name="pot1">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -1114,7 +1114,7 @@ QPushButton:checked {
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="dialValue1">
<widget class="QLabel" name="potValue1">
<property name="text">
<string notr="true">0 %</string>
</property>
@@ -1137,7 +1137,7 @@ QPushButton:checked {
</spacer>
</item>
<item row="8" column="0">
<widget class="myQDial" name="dial2">
<widget class="myQDial" name="pot2">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
@@ -1171,7 +1171,7 @@ QPushButton:checked {
</widget>
</item>
<item row="9" column="0">
<widget class="QLabel" name="dialValue2">
<widget class="QLabel" name="potValue2">
<property name="text">
<string notr="true">0 %</string>
</property>