Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues 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

6
companion/src/burnconfigdialog.cpp
View file

@ -102,7 +102,11 @@ void burnConfigDialog::getSettings()
avrProgrammer = settings.value("programmer", QString("usbasp")).toString(); avrProgrammer = settings.value("programmer", QString("usbasp")).toString();
avrMCU = settings.value("mcu", QString("m64")).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(); avrPort = settings.value("avr_port", "").toString();
sambaPort = settings.value("samba_port", "\\USBserial\\COM23").toString(); sambaPort = settings.value("samba_port", "\\USBserial\\COM23").toString();

5
companion/src/burnconfigdialog.ui
View file

@ -616,6 +616,11 @@ m2560 for v4.1 boards</string>
<string notr="true">at91sam3s4-9x</string> <string notr="true">at91sam3s4-9x</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>at91sam3s8-9xr</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">

4
companion/src/eeprominterface.cpp
View file

@ -384,10 +384,10 @@ QString RawSwitch::toString()
break; break;
case SWITCH_TYPE_REA: case SWITCH_TYPE_REA:
if (index==0) { if (index==0) {
if (IS_SKY9X(eepromInterface->getBoard())) if (IS_SKY9X(GetEepromInterface()->getBoard()))
return QObject::tr("REAs"); return QObject::tr("REAs");
} else if (index==1) { } else if (index==1) {
if (IS_SKY9X(eepromInterface->getBoard())) if (IS_SKY9X(GetEepromInterface()->getBoard()))
return QObject::tr("REAl"); return QObject::tr("REAl");
} }
break; break;

2
companion/src/mainwindow.cpp
View file

@ -966,7 +966,7 @@ QStringList MainWindow::GetReceiveFlashCommand(const QString &filename)
} else if (eepromInterface->getBoard() == BOARD_SKY9X) { } else if (eepromInterface->getBoard() == BOARD_SKY9X) {
return GetSambaArguments(QString("receive_file {Flash} \"") + filename + "\" 0x400000 0x40000 0\n"); return GetSambaArguments(QString("receive_file {Flash} \"") + filename + "\" 0x400000 0x40000 0\n");
} else if (eepromInterface->getBoard() == BOARD_9XRPRO) { } 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 { } else {
return GetAvrdudeArguments("flash:r:", filename); return GetAvrdudeArguments("flash:r:", filename);
} }