Skip to content

Commit f75a91f

Browse files
patrickelectricpatrickelectric
committed
All boards compiling
All boards are compiling in version 1.6.0 of Arduino TODO: test all upload methods Signed-off-by: Patrick J.P <[email protected]>
1 parent 86a7304 commit f75a91f

File tree

8 files changed

+52
-51
lines changed

8 files changed

+52
-51
lines changed

‎IDEApplication.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ void IDEApplication::initializePlugins()
138138
void IDEApplication::initializeTranslator()
139139
{
140140
if(! mTranslator.load("arduide_" + QLocale::system().name(), TRANSLATION_PATH))
141-
{
142-
qDebug() << "loading translator failed.";
143-
}
141+
{
142+
qDebug() << "loading translator failed.";
143+
}
144144
installTranslator(&mTranslator);
145145
}

‎TODO

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
General:
2-
* Arduino Pro Mini, compiling not working.
2+
* Test upload process with all boards
33
* Put UTF-8
44
* have a configuration dialog (Qxt provides a nice one)
55
- output verbosity
@@ -57,6 +57,7 @@ Packaging:
5757
-> adapt CMakeLists.txt
5858

5959
DONE:
60+
* compatibility with Arduino 1.6.0
6061
* have a configuration dialog (Qxt provides a nice one)
6162
- possibility to change arduino, sketchbook paths [DONE]
6263
* functionality as plugins [DONE]

‎env/.Builder.cpp.kate-swp

-378 Bytes
Binary file not shown.

‎env/Board.cpp

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,31 +60,32 @@ void Board::listBoards()
6060
while (! boardsFile.atEnd())
6161
{
6262
QString line = QString::fromLocal8Bit(boardsFile.readLine()).trimmed();
63-
//QString line = QString::fromLocal8Bit(boardsFile.readLine().simplified());
63+
6464
if (line.isEmpty() || line[0] == '#')
6565
continue;
6666

6767
QString attrName = line.section('=', 0, 0);
6868
QString attrValue = line.section('=', 1);
69-
69+
7070
// attrName = <product>.<attrName>
7171
QString productId = attrName.section('.', 0, 0);
7272
attrName = attrName.section('.', 1);
73-
7473
Board &board = mBoards[productId];
75-
board.mAttributes[attrName] = attrValue;
74+
75+
//it does seem pretty odd that they have build.mcu as atmegang which isn't a valid mcu, and then the cpu submenu is being used as the mcu.
76+
if(!attrValue.contains("atmegang"))
77+
board.mAttributes[attrName] = attrValue;
7678
board.mHardwarePath = QFileInfo(boardFile).dir().absolutePath();
77-
//if((attrName == "menu.cpu.atmega8" or attrName == "menu.cpu.atmega168" or attrName == "menu.cpu.atmega328" or attrName == "menu.cpu.atmega1280" or attrName == "menu.cpu.atmega2560") and !board.mAttributes.contains("menu.cpu"))
78-
// We have a board that
79+
7980
if(attrName.contains("menu.cpu") and attrName.contains("build.mcu"))
8081
{
81-
if(board.mAttributes.contains("menu.cpu"))
82+
if(board.mAttributes.contains("build.mcu"))
8283
{
83-
if(!board.mAttributes["menu.cpu"].contains(attrValue))
84-
board.mAttributes["menu.cpu"]=board.mAttributes["menu.cpu"]+","+attrValue;
84+
if(!board.mAttributes["build.mcu"].contains(attrValue))
85+
board.mAttributes["build.mcu"]=board.mAttributes["build.mcu"]+","+attrValue;
8586
}
8687
else
87-
board.mAttributes["menu.cpu"]=attrValue;
88+
board.mAttributes["build.mcu"]=attrValue;
8889
}
8990

9091
if(attrName.contains("menu.cpu") and attrName.contains("build.f_cpu"))
@@ -96,17 +97,7 @@ void Board::listBoards()
9697
}
9798
else
9899
board.mAttributes["build.f_cpu"]=attrValue;
99-
}
100-
101-
/*
102-
if(board.mAttributes.contains("menu.cpu"))
103-
if(board.mAttributes.contains("build.f_cpu"))
104-
{
105-
qDebug() << line;
106-
qDebug() << board.mAttributes["menu.cpu"] << board.mAttributes["build.f_cpu"];
107-
qDebug() << board.name();
108-
}
109-
*/
100+
}
110101
}
111102

112103
boardsFile.close();

‎env/Builder.cpp

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,36 @@ Builder::Builder(QObject *parent)
5151
const Board *Builder::board() const
5252
{
5353
QString name;
54-
if(ideApp->settings()->board().split(",").size() > 1)
54+
QString mcu;
55+
QString freq;
56+
57+
name = ideApp->settings()->board().split(",")[0];
58+
59+
if(ideApp->settings()->board().split(",").size()>1)
5560
{
56-
name = ideApp->settings()->board().split(",")[0];
57-
Board::mBoards[name].mAttributes["build.mcu"]=ideApp->settings()->board().split(",")[1];
58-
}
61+
mcu = ideApp->settings()->board().split(",")[1];
62+
Board::mBoards[name].mAttributes["builder.mcu"]= mcu;
63+
64+
if(ideApp->settings()->board().split(",").size()>2)
65+
{
66+
freq = ideApp->settings()->board().split(",")[2];
67+
Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
68+
}
69+
else
70+
{
71+
freq = Board::mBoards[name].mAttributes["build.f_cpu"];
72+
Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
73+
}
74+
}
5975
else
60-
name = ideApp->settings()->board();
76+
{
77+
mcu = Board::mBoards[name].mAttributes["build.mcu"];
78+
Board::mBoards[name].mAttributes["builder.mcu"]= mcu;
79+
80+
freq = Board::mBoards[name].mAttributes["build.f_cpu"];
81+
Board::mBoards[name].mAttributes["builder.f_cpu"]= freq;
82+
}
6183

62-
qDebug() << name << Board::mBoards[name].mAttributes["build.mcu"] << "Board Builder <<";
6384
return Board::boardInfo(name);
6485
}
6586

‎env/Toolkit.cpp

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ QString Toolkit::avrPath()
167167
}
168168
#endif
169169
}
170+
170171
QString Toolkit::avrTool(Toolkit::AVRTool tool)
171172
{
172173
QString path = avrPath();
@@ -201,13 +202,6 @@ QString Toolkit::avrTool(Toolkit::AVRTool tool)
201202

202203
QStringList Toolkit::avrCFlags(const Board *board)
203204
{
204-
qDebug() << board->attribute("build.mcu");
205-
QString buildMCU="build.mcu";
206-
QString typeMCU="";
207-
if(board->mAttributes.contains("menu.cpu.atmega2560"))
208-
typeMCU="menu.cpu.atmega2560";
209-
210-
qDebug() << buildMCU << typeMCU << board->attribute(buildMCU);
211205
QStringList cflags;
212206
cflags
213207
<< "-g"
@@ -216,8 +210,8 @@ QStringList Toolkit::avrCFlags(const Board *board)
216210
<< "-fno-exceptions"
217211
<< "-ffunction-sections"
218212
<< "-fdata-sections"
219-
<< QString("-mmcu=%0").arg(board->attribute(buildMCU))
220-
<< QString("-DF_CPU=%0").arg(board->attribute("build.f_cpu"))
213+
<< QString("-mmcu=%0").arg(board->attribute("builder.mcu"))
214+
<< QString("-DF_CPU=%0").arg(board->attribute("builder.f_cpu"))
221215
<< QString("-MMD")
222216
<< QString("-DARDUINO=%0").arg(toolkitVersionInt(ideApp->settings()->arduinoPath()));
223217

@@ -257,9 +251,9 @@ QStringList Toolkit::avrSFlags(const Board *board)
257251
sflags
258252
<< "-g"
259253
<< "-assembler-with-cpp"
260-
<< QString("-mmcu=%0").arg(board->attribute("build.mcu"))
254+
<< QString("-mmcu=%0").arg(board->attribute("builder.mcu"))
261255
<< QString("-MMD")
262-
<< QString("-DF_CPU=%0").arg(board->attribute("build.f_cpu"))
256+
<< QString("-DF_CPU=%0").arg(board->attribute("builder.f_cpu"))
263257
<< QString("-DARDUINO=%0").arg(toolkitVersionInt(ideApp->settings()->arduinoPath()));
264258
return sflags;
265259
}
@@ -270,7 +264,7 @@ QStringList Toolkit::avrLdFlags(const Board *board)
270264
ldflags
271265
<< "-Os"
272266
<< "-Wl,--gc-sections"
273-
<< QString("-mmcu=%0").arg(board->attribute("build.mcu"));
267+
<< QString("-mmcu=%0").arg(board->attribute("builder.mcu"));
274268
return ldflags;
275269
}
276270

@@ -405,7 +399,7 @@ QStringList Toolkit::avrdudeFlags(const Board *board)
405399
else
406400
flags << QDir(hardwarePath()).filePath("tools/avrdude.conf");
407401
#endif
408-
flags << QString("-p%0").arg(board->attribute("build.mcu"));
402+
flags << QString("-p%0").arg(board->attribute("builder.mcu"));
409403

410404
return flags;
411405
}

‎gui/BoardChooser.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void BoardChooser::refresh()
5353
foreach(const QString &boardId, Board::boardIds())
5454
{
5555
const Board *board = Board::boardInfo(boardId);
56-
QStringList cpus = board->attribute("menu.cpu").split(",");
56+
QStringList cpus = board->attribute("build.mcu").split(",");
5757
QStringList freqs = board->attribute("build.f_cpu").split(",");
5858
if(cpus.size() > 1)
5959
{
@@ -72,7 +72,6 @@ void BoardChooser::refresh()
7272
}
7373
else
7474
{
75-
qDebug() << "FREQS > 1";
7675
QMenu *menu2 = new QMenu;
7776
foreach(const QString &freq, freqs)
7877
{
@@ -84,12 +83,10 @@ void BoardChooser::refresh()
8483
menu2->addAction(action2);
8584
menu2->setTitle(cpu);
8685
menu1->addMenu(menu2);
87-
qDebug() << freqs << freq;
8886
}
8987
}
9088

9189
this->addMenu(menu1);
92-
qDebug() << board->name() << cpu << cpus << freqs;
9390
}
9491
}
9592
else
@@ -100,14 +97,12 @@ void BoardChooser::refresh()
10097
if (boardId == defaultBoard)
10198
action->setChecked(true);
10299
addAction(action);
103-
qDebug() << board->name() << board->attribute("menu.cpu");
104100
}
105101

106102
}
107103
}
108104

109105
void BoardChooser::onActionTriggered(QAction *action)
110106
{
111-
qDebug() << action->data().toString();
112107
emit boardChosen(action->data().toString());
113108
}

‎utils/unix/Serial.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ void Serial::close()
117117
qint64 Serial::readData(char *data, qint64 maxSize)
118118
{
119119
ssize_t n = ::read(mSerial, data, maxSize);
120-
//qDebug() << n;
121120
if (n > 0)
122121
return n;
123122

0 commit comments

Comments
 (0)