Pass design to gui, display chip name

This commit is contained in:
Miodrag Milanovic 2018-06-10 18:25:23 +02:00
parent d3f1112580
commit 67227847e5
8 changed files with 45 additions and 5 deletions

View File

@ -21,6 +21,7 @@
Chip::Chip(ChipArgs) {}
std::string Chip::getChipName() { return "Dummy"; }
// ---------------------------------------------------------------
BelId Chip::getBelByName(IdString name) const { return BelId(); }

View File

@ -61,10 +61,14 @@ struct ChipArgs
{
};
std::string getChipName(ChipArgs id);
struct Chip
{
Chip(ChipArgs args);
std::string getChipName();
BelId getBelByName(IdString name) const;
IdString getBelName(BelId bel) const;
void bindBel(BelId bel, IdString cell);

View File

@ -28,7 +28,7 @@ int main(int argc, char *argv[])
Design design(ChipArgs{});
QApplication a(argc, argv);
MainWindow w;
MainWindow w(&design);
w.show();
return a.exec();

View File

@ -6,8 +6,8 @@
#include "pybindings.h"
#include "ui_mainwindow.h"
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow)
MainWindow::MainWindow(Design *_design, QWidget *parent)
: QMainWindow(parent), ui(new Ui::MainWindow), design(_design)
{
ui->setupUi(this);
PyImport_ImportModule("emb");
@ -19,6 +19,8 @@ MainWindow::MainWindow(QWidget *parent)
ui->plainTextEdit->appendPlainText(s.c_str());
};
emb::set_stdout(write);
std::string title = "nextpnr-ice40 - " + design->chip.getChipName();
setWindowTitle(title.c_str());
}
MainWindow::~MainWindow() { delete ui; }

View File

@ -1,5 +1,6 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include "design.h"
#include "emb.h"
#include <QMainWindow>
@ -13,7 +14,7 @@ class MainWindow : public QMainWindow
Q_OBJECT
public:
explicit MainWindow(QWidget *parent = 0);
explicit MainWindow(Design *design, QWidget *parent = 0);
~MainWindow();
private:
@ -25,6 +26,7 @@ class MainWindow : public QMainWindow
private:
Ui::MainWindow *ui;
emb::stdout_write_type write;
Design *design;
};
#endif // MAINWINDOW_H

View File

@ -106,6 +106,35 @@ Chip::Chip(ChipArgs args) : args(args)
// -----------------------------------------------------------------------
std::string Chip::getChipName()
{
#ifdef ICE40_HX1K_ONLY
if (args.type == ChipArgs::HX1K) {
return "Lattice LP1K";
} else {
log_error("Unsupported iCE40 chip type.\n");
}
#else
if (args.type == ChipArgs::LP384) {
return "Lattice LP384";
} else if (args.type == ChipArgs::LP1K) {
return "Lattice LP1K";
} else if (args.type == ChipArgs::HX1K) {
return "Lattice HX1K";
} else if (args.type == ChipArgs::UP5K) {
return "Lattice UP5K";
} else if (args.type == ChipArgs::LP8K) {
return "Lattice LP8K";
} else if (args.type == ChipArgs::HX8K) {
return "Lattice HX8K";
} else {
log_error("Unknown chip\n");
}
#endif
}
// -----------------------------------------------------------------------
BelId Chip::getBelByName(IdString name) const
{
BelId ret;

View File

@ -419,6 +419,8 @@ struct Chip
ChipArgs args;
// -------------------------------------------------
std::string getChipName();
BelId getBelByName(IdString name) const;
IdString getBelName(BelId bel) const

View File

@ -269,7 +269,7 @@ int main(int argc, char *argv[])
if (vm.count("gui")) {
QApplication a(argc, argv);
MainWindow w;
MainWindow w(&design);
w.show();
rc = a.exec();