diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-21 12:22:41 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-21 12:22:41 +0200 |
| commit | 09a68affa388ffafdf361ccd3de621173f2b8b48 (patch) | |
| tree | 4fe8ce1cfa4c0cac7f917bd8319c7de8c527c523 | |
| parent | fe239366b5ac52374198a061d96b2224ca689412 (diff) | |
| download | nextpnr-09a68affa388ffafdf361ccd3de621173f2b8b48.tar.gz nextpnr-09a68affa388ffafdf361ccd3de621173f2b8b48.tar.bz2 nextpnr-09a68affa388ffafdf361ccd3de621173f2b8b48.zip | |
Fix warnings and status
| -rw-r--r-- | gui/ice40/mainwindow.cc | 4 | ||||
| -rw-r--r-- | ice40/main.cc | 6 | ||||
| -rw-r--r-- | ice40/picorv32.proj | 15 |
3 files changed, 21 insertions, 4 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 017ca2fa..847698c5 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -222,11 +222,11 @@ void MainWindow::new_proj() QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type),
0, false, &ok);
- if (ok && !item.isEmpty()) {
- disableActions();
+ if (ok && !item.isEmpty()) {
currentProj = "";
currentJson = "";
currentPCF = "";
+ disableActions();
chipArgs.package = package.toStdString().c_str();
ctx = std::unique_ptr<Context>(new Context(chipArgs));
actionLoadJSON->setEnabled(true);
diff --git a/ice40/main.cc b/ice40/main.cc index 652196a1..70324a91 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -68,8 +68,10 @@ void svg_dump_decal(const Context *ctx, const DecalXY &decal) void conflicting_options(const boost::program_options::variables_map &vm, const char *opt1, const char *opt2) { - if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) - log_error((std::string("Conflicting options '") + opt1 + "' and '" + opt2 + "'.").c_str()); + if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) { + std::string msg = "Conflicting options '"+ std::string(opt1) + "' and '" + std::string(opt1) + "'."; + log_error("%s\n",msg.c_str()); + } } int main(int argc, char *argv[]) diff --git a/ice40/picorv32.proj b/ice40/picorv32.proj new file mode 100644 index 00000000..a8c83bd9 --- /dev/null +++ b/ice40/picorv32.proj @@ -0,0 +1,15 @@ +{ + "project": { + "version": "1", + "name": "picorv32", + "arch": { + "name": "ice40", + "type": "hx8k", + "package": "ct256" + }, + "input": { + "json": "picorv32.json", + "pcf": "icebreaker.pcf" + } + } +} |