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

9XR support n companion, still not finished

Browse Source
This commit is contained in:
romoloman@github.com
2013-12-21 20:05:20 +01:00
parent ee1b51b214
commit 4eedf94f03
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/burnconfigdialog.cpp
+5 -1
View File
@@ -102,7 +102,11 @@ void burnConfigDialog::getSettings()
avrProgrammer = settings.value("programmer", QString("usbasp")).toString();
avrMCU = settings.value("mcu", QString("m64")).toString();
armMCU = settings.value("arm_mcu", QString("at91sam3s4-9x")).toString();
if (GetEepromInterface()->getBoard()==BOARD_SKY9X) {
armMCU = settings.value("arm_mcu", QString("at91sam3s4-9x")).toString();
} else {
armMCU = settings.value("arm_mcu", QString("at91sam3s8-9xr")).toString();
}
avrPort = settings.value("avr_port", "").toString();
sambaPort = settings.value("samba_port", "\\USBserial\\COM23").toString();
companion/src/burnconfigdialog.ui
+5
View File
@@ -616,6 +616,11 @@ m2560 for v4.1 boards</string>
<string notr="true">at91sam3s4-9x</string>
</property>
</item>
<item>
<property name="text">
<string>at91sam3s8-9xr</string>
</property>
</item>
</widget>
</item>
<item row="6" column="0">
companion/src/eeprominterface.cpp
+2 -2
View File
@@ -384,10 +384,10 @@ QString RawSwitch::toString()
break;
case SWITCH_TYPE_REA:
if (index==0) {
if (IS_SKY9X(eepromInterface->getBoard()))
if (IS_SKY9X(GetEepromInterface()->getBoard()))
return QObject::tr("REAs");
} else if (index==1) {
if (IS_SKY9X(eepromInterface->getBoard()))
if (IS_SKY9X(GetEepromInterface()->getBoard()))
return QObject::tr("REAl");
}
break;
companion/src/mainwindow.cpp
+1 -1
View File
@@ -966,7 +966,7 @@ QStringList MainWindow::GetReceiveFlashCommand(const QString &filename)
} else if (eepromInterface->getBoard() == BOARD_SKY9X) {
return GetSambaArguments(QString("receive_file {Flash} \"") + filename + "\" 0x400000 0x40000 0\n");
} else if (eepromInterface->getBoard() == BOARD_9XRPRO) {
return GetSambaArguments(QString("receive_file {Flash} \"") + filename + "\" 0x400000 0x40000 0\n");
return GetSambaArguments(QString("receive_file {Flash} \"") + filename + "\" 0x400000 0x80000 0\n");
} else {
return GetAvrdudeArguments("flash:r:", filename);
}