Use proper names in GUI

rroohhh · Jul 8, 2020 · 1fae965 · 1fae965
1 parent 32ddc94
commit 1fae965
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
@@ -78,29 +78,29 @@ void MainWindow::new_proj()
 {
     QMap<QString, int> arch;
     if (Arch::isAvailable(ArchArgs::LP384))
-        arch.insert("Lattice LP384", ArchArgs::LP384);
+        arch.insert("Lattice iCE40LP384", ArchArgs::LP384);
     if (Arch::isAvailable(ArchArgs::LP1K))
-        arch.insert("Lattice LP1K", ArchArgs::LP1K);
+        arch.insert("Lattice iCE40LP1K", ArchArgs::LP1K);
     if (Arch::isAvailable(ArchArgs::HX1K))
-        arch.insert("Lattice HX1K", ArchArgs::HX1K);
+        arch.insert("Lattice iCE40HX1K", ArchArgs::HX1K);
     if (Arch::isAvailable(ArchArgs::U1K))
-        arch.insert("Lattice U1K", ArchArgs::U1K);
+        arch.insert("Lattice iCE5LP1K", ArchArgs::U1K);
     if (Arch::isAvailable(ArchArgs::U2K))
-        arch.insert("Lattice U2K", ArchArgs::U2K);
+        arch.insert("Lattice iCE5LP2K", ArchArgs::U2K);
     if (Arch::isAvailable(ArchArgs::U4K))
-        arch.insert("Lattice U4K", ArchArgs::U4K);
+        arch.insert("Lattice iCE5LP4K", ArchArgs::U4K);
     if (Arch::isAvailable(ArchArgs::UP3K))
-        arch.insert("Lattice UP3K", ArchArgs::UP3K);
+        arch.insert("Lattice iCE40UP3K", ArchArgs::UP3K);
     if (Arch::isAvailable(ArchArgs::UP5K))
-        arch.insert("Lattice UP5K", ArchArgs::UP5K);
+        arch.insert("Lattice iCE40UP5K", ArchArgs::UP5K);
     if (Arch::isAvailable(ArchArgs::LP4K))
-        arch.insert("Lattice LP4K", ArchArgs::LP4K);
+        arch.insert("Lattice iCE40LP4K", ArchArgs::LP4K);
     if (Arch::isAvailable(ArchArgs::LP8K))
-        arch.insert("Lattice LP8K", ArchArgs::LP8K);
+        arch.insert("Lattice iCE40LP8K", ArchArgs::LP8K);
     if (Arch::isAvailable(ArchArgs::HX4K))
-        arch.insert("Lattice HX4K", ArchArgs::HX4K);
+        arch.insert("Lattice iCE40HX4K", ArchArgs::HX4K);
     if (Arch::isAvailable(ArchArgs::HX8K))
-        arch.insert("Lattice HX8K", ArchArgs::HX8K);
+        arch.insert("Lattice iCE40HX8K", ArchArgs::HX8K);
 
     bool ok;
     QString item = QInputDialog::getItem(this, "Select new context", "Chip:", arch.keys(), 0, false, &ok);

diff --git a/ice40/arch.cc b/ice40/arch.cc
@@ -122,29 +122,29 @@ Arch::Arch(ArchArgs args) : args(args)
 std::string Arch::getChipName() const
 {
     if (args.type == ArchArgs::LP384) {
-        return "Lattice LP384";
+        return "Lattice iCE40LP384";
     } else if (args.type == ArchArgs::LP1K) {
-        return "Lattice LP1K";
+        return "Lattice iCE40LP1K";
     } else if (args.type == ArchArgs::HX1K) {
-        return "Lattice HX1K";
+        return "Lattice iCE40HX1K";
     } else if (args.type == ArchArgs::UP3K) {
-        return "Lattice UP3K";
+        return "Lattice iCE40UP3K";
     } else if (args.type == ArchArgs::UP5K) {
-        return "Lattice UP5K";
+        return "Lattice iCE40UP5K";
     } else if (args.type == ArchArgs::U1K) {
-        return "Lattice U1K";
+        return "Lattice iCE5LP1K";
     } else if (args.type == ArchArgs::U2K) {
-        return "Lattice U2K";
+        return "Lattice iCE5LP2K";
     } else if (args.type == ArchArgs::U4K) {
-        return "Lattice U4K";
+        return "Lattice iCE5LP4K";
     } else if (args.type == ArchArgs::LP4K) {
-        return "Lattice LP4K";
+        return "Lattice iCE40LP4K";
     } else if (args.type == ArchArgs::LP8K) {
-        return "Lattice LP8K";
+        return "Lattice iCE40LP8K";
     } else if (args.type == ArchArgs::HX4K) {
-        return "Lattice HX4K";
+        return "Lattice iCE40HX4K";
     } else if (args.type == ArchArgs::HX8K) {
-        return "Lattice HX8K";
+        return "Lattice iCE40HX8K";
     } else {
         log_error("Unknown chip\n");
     }