Solved pro mini upload problem

Arduino pro mini have a diferent subname on boards.txt
pro.menu.cpu.16MHzatmega32.
subname = freqInMHz + normalSubname

Fix #7

Signed-off-by: Patrick J.P <[email protected]>

Author: patrickelectric

env/Board.cpp

@@ -133,3 +133,25 @@ QString Board::attribute(const QString &attr) const
     else
         return *it;
 }
+
+void Board::setSelectedBoard(QString _name, QString _mcu, QString _freq)
+{
+    name_ = _name;
+    mcu_  = _mcu;
+    freq_ = _freq;
+}
+
+QString Board::selectedName() const
+{
+    return name_;
+}
+
+QString Board::selectedMcu() const
+{
+    return mcu_;
+}
+
+QString Board::selectedFreq() const
+{
+    return freq_;
+}

env/Board.h

@@ -3,7 +3,7 @@
 
   This file is part of arduide, The Qt-based IDE for the open-source Arduino electronics prototyping platform.
 
-  Copyright (C) 2010-2016 
+  Copyright (C) 2010-2016
   Authors : Denis Martinez
 	    Martin Peres
 
@@ -36,78 +36,115 @@ This program is free software; you can redistribute it and/or modify
 
 /**
  * @brief A class to help deal with boards.txt
- * 
+ *
  */
 
 class Board
 {
 public:
-    
+
     /**
     * @brief Return the name of the board
     * e.g: uno.name="Arduino Uno"
-    * 
+    *
     * @return const QString&
     */
     const QString& name() const;
 
-    
+
     /**
      * @brief Return all Ids of the boards in boards.txt
-     * 
+     *
      * @return QStringList
      */
     static QStringList boardIds();
-    
-    
+
+
     /**
      * @brief Return a pointer to Board class with the board information.
-     * 
+     *
      * @param name The board name. e.g: "uno" (uno.name=Arduino Uno)
      * @return const Board*
      */
     static const Board *boardInfo(const QString &name);
 
     /**
      * @brief Return the path of hardware directory
-     * 
+     *
      * @return QString
      */
     QString hardwarePath() const { return mHardwarePath; };
 
     /**
      * @brief Return the value of an attribute
-     * 
+     *
      * @param attr attribute name. e.g: "name" (uno.name=Arduino Uno)
      * @return QString
      */
     QString attribute(const QString &attr) const;
-    
+
     /**
      * @brief Stores all board's attribute
-     * 
+     *
      */
     QHash<QString, QString> mAttributes;
-    
+
     /**
      * @brief save all boards in mBoards
-     * 
+     *
      */
     static QMap<QString, Board> mBoards;
-    
+
+    /**
+     * @brief Set info about selected board
+     *
+     * @param name name of selected board
+     * @param mcu mcu of selected board
+     * @param freq freq of selected mcu
+     * @return void
+     */
+    void setSelectedBoard(QString _name, QString _mcu, QString _freq);
+
+    /**
+     * @brief Return selected board name
+     *
+     * @return QString
+     */
+    QString selectedName() const;
+
+    /**
+     * @brief Return selected mcu of the board
+     *
+     * @return QString
+     */
+
+    QString selectedMcu() const;
+
+    /**
+     * @brief Return selected freq of mcu
+     *
+     * @return QString
+     */
+    QString selectedFreq() const;
+
 private:
-    
     /**
-    * @brief Function that read boards.txt to identify all compatible boards 
-    * 
+     * @brief Useful info to identify the selected board
+     *
+     */
+    QString name_,mcu_,freq_;
+
+    /**
+    * @brief Function that read boards.txt to identify all compatible boards
+    *
     * @return void
     */
     static void listBoards();
-    
-    
+
+
     /**
      * @brief Check if boards.txt has already been read
-     * 
+     *
      */
     static bool mListed;
 

env/Builder.cpp

@@ -50,41 +50,67 @@ Builder::Builder(QObject *parent)
 
 const Board *Builder::board() const
 {
-    QString name;
-    QString mcu;
-    QString freq;
+    Board::mBoards[name()].setSelectedBoard(name(), mcu(), freq());
 
-    name = ideApp->settings()->board().split(",")[0];
+    if(name()=="" or mcu() =="")
+        return NULL;
+
+    return Board::boardInfo(name());
+}
+
+const QString Builder::name() const
+{
+    return ideApp->settings()->board().split(",")[0];
+}
 
+const QString Builder::mcu() const
+{
     if(ideApp->settings()->board().split(",").size()>1)
     {
-        mcu = ideApp->settings()->board().split(",")[1];
-        Board::mBoards[name].mAttributes["builder.mcu"]= mcu;
-
-        if(ideApp->settings()->board().split(",").size()>2)
-        {
-            freq = ideApp->settings()->board().split(",")[2];
-            Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
-        }
-        else
-        {
-            freq = Board::mBoards[name].mAttributes["build.f_cpu"];
-            Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
-        }
+        return ideApp->settings()->board().split(",")[1];
     }
     else
     {
-        mcu = Board::mBoards[name].mAttributes["build.mcu"];
-        Board::mBoards[name].mAttributes["builder.mcu"]= mcu;
-
-        freq = Board::mBoards[name].mAttributes["build.f_cpu"];
-        Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
+        return Board::mBoards[name()].mAttributes["build.mcu"];
     }
+}
 
-    if(name=="" or mcu =="")
-        return NULL;
+const QString Builder::freq() const
+{
+    if(ideApp->settings()->board().split(",").size()>2)
+        return ideApp->settings()->board().split(",")[2];
 
-    return Board::boardInfo(name);
+    return Board::mBoards[name()].mAttributes["build.f_cpu"];
+}
+
+const QString Builder::uploadSpeed() const
+{
+    // if we have more than one mcu
+    if(board()->attribute("upload.speed")=="")
+    {
+        QString subName = board()->selectedMcu();
+        if(subName.right(1)=="p")
+            subName = subName.left(subName.length() -1);
+
+        // arduino pro mini use other nomenclature for subName
+        if(name() == "pro")
+        {
+            QString subFreq = freq().left(freq().length()-7)+"MHz";
+            subName = subFreq + subName;
+        }
+
+        return board()->attribute("menu.cpu."+subName+".upload.speed");
+    }
+    else
+        return board()->attribute("upload.speed");
+}
+
+const QString Builder::uploadProtocol() const
+{
+    QString protocol = board()->attribute("upload.protocol");
+    if (protocol == "stk500")
+        protocol = "stk500v1";
+    return protocol;
 }
 
 const QString Builder::device() const
@@ -192,7 +218,7 @@ bool Builder::build(const QString &code, bool upload)
         return false;
     }
 
-    emit logImportant(tr("Compiling for %0...").arg(board()->name()));
+    emit logImportant(tr("Compiling for %0...").arg(name()));
     mBuildDir.reset(new QxtTemporaryDir(QDir(QDir::tempPath()).filePath("arduino-build")));
     QString buildPath = mBuildDir->path();
 
@@ -490,28 +516,13 @@ bool Builder::extractHEX(const QString &input, const QString &output)
 
 bool Builder::uploadViaBootloader(const QString &hexFileName)
 {
-    QString protocol = board()->attribute("upload.protocol");
-    if (protocol == "stk500")
-        protocol = "stk500v1";
-
-    if(board()->attribute("upload.speed")=="")
-    {
-        QString name = ideApp->settings()->board().split(",")[0];
-
-        QString subName = board()->attribute("builder.mcu");
-        if(subName.right(1)=="p")
-            subName = subName.left(subName.length() -1);
-        QString uploadSpeed = board()->attribute("menu.cpu."+subName+".upload.speed");
-        Board::mBoards[name].mAttributes["upload.speed"]= uploadSpeed;
-    }
-
     QStringList command;
     command
         << Toolkit::avrdudePath()
         << Toolkit::avrdudeFlags(board())
-        << "-c" << protocol
+        << "-c" << uploadProtocol()
         << "-P" << device()
-        << "-b" << board()->attribute("upload.speed")
+        << "-b" << uploadSpeed()
         << "-D"
         << QString("-Uflash:w:%0:i").arg(hexFileName);