Fix warnings and status
This commit is contained in:
parent
fe239366b5
commit
09a68affa3
@ -222,11 +222,11 @@ void MainWindow::new_proj()
|
|||||||
QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type),
|
QString package = QInputDialog::getItem(this, "Select package", "Package:", getSupportedPackages(chipArgs.type),
|
||||||
0, false, &ok);
|
0, false, &ok);
|
||||||
|
|
||||||
if (ok && !item.isEmpty()) {
|
if (ok && !item.isEmpty()) {
|
||||||
disableActions();
|
|
||||||
currentProj = "";
|
currentProj = "";
|
||||||
currentJson = "";
|
currentJson = "";
|
||||||
currentPCF = "";
|
currentPCF = "";
|
||||||
|
disableActions();
|
||||||
chipArgs.package = package.toStdString().c_str();
|
chipArgs.package = package.toStdString().c_str();
|
||||||
ctx = std::unique_ptr<Context>(new Context(chipArgs));
|
ctx = std::unique_ptr<Context>(new Context(chipArgs));
|
||||||
actionLoadJSON->setEnabled(true);
|
actionLoadJSON->setEnabled(true);
|
||||||
|
@ -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)
|
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())
|
if (vm.count(opt1) && !vm[opt1].defaulted() && vm.count(opt2) && !vm[opt2].defaulted()) {
|
||||||
log_error((std::string("Conflicting options '") + opt1 + "' and '" + opt2 + "'.").c_str());
|
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[])
|
int main(int argc, char *argv[])
|
||||||
|
15
ice40/picorv32.proj
Normal file
15
ice40/picorv32.proj
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"project": {
|
||||||
|
"version": "1",
|
||||||
|
"name": "picorv32",
|
||||||
|
"arch": {
|
||||||
|
"name": "ice40",
|
||||||
|
"type": "hx8k",
|
||||||
|
"package": "ct256"
|
||||||
|
},
|
||||||
|
"input": {
|
||||||
|
"json": "picorv32.json",
|
||||||
|
"pcf": "icebreaker.pcf"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user