From 4eedf94f03623de2a334c8267c0253df18742020 Mon Sep 17 00:00:00 2001
From: "romoloman@github.com" <>
Date: Sat, 21 Dec 2013 20:05:20 +0100
Subject: [PATCH] 9XR support n companion, still not finished

---
 companion/src/burnconfigdialog.cpp | 6 +++++-
 companion/src/burnconfigdialog.ui  | 5 +++++
 companion/src/eeprominterface.cpp  | 4 ++--
 companion/src/mainwindow.cpp       | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/companion/src/burnconfigdialog.cpp b/companion/src/burnconfigdialog.cpp
index d60ba768b..d7f2b53f7 100644
--- a/companion/src/burnconfigdialog.cpp
+++ b/companion/src/burnconfigdialog.cpp
@@ -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();
diff --git a/companion/src/burnconfigdialog.ui b/companion/src/burnconfigdialog.ui
index ba1adbf17..dd6d031ff 100644
--- a/companion/src/burnconfigdialog.ui
+++ b/companion/src/burnconfigdialog.ui
@@ -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">
diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 2391e7071..1325be6b3 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -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;
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
index 6dae2a3d0..878834bf7 100644
--- a/companion/src/mainwindow.cpp
+++ b/companion/src/mainwindow.cpp
@@ -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);
     }