refactor CGXBoards component, update DataInfo for CGX boards

tdolphin-org · Dec 19, 2024 · 0d67cfd · 0d67cfd
1 parent 99db75e
commit 0d67cfd
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/app/appversion.txt b/app/appversion.txt
@@ -1 +1 @@
-export APP_VERSION = 0.2.1
+export APP_VERSION = 0.2.2
diff --git a/...rc/Components/Tabs/Graphics/CgxBoards.cpp → ...rc/Components/Tabs/Graphics/CGXBoards.cpp b/...rc/Components/Tabs/Graphics/CgxBoards.cpp → ...rc/Components/Tabs/Graphics/CGXBoards.cpp
@@ -4,7 +4,7 @@
 //  (c) 2024 TDolphin
 //
 
-#include "CgxBoards.hpp"
+#include "CGXBoards.hpp"
 #include "AppContext.hpp"
 
 #include "AOS/Cybergraphics/Library.hpp"
@@ -13,7 +13,7 @@
 
 namespace Components
 {
-    CgxBoards::CgxBoards()
+    CGXBoards::CGXBoards()
       : mComponent(MUI::GroupBuilder()
                        .tagFrame(MUI::Frame::Group)
                        .tagBackground(MUI::ImageOrBackground::WindowBack)
@@ -56,7 +56,11 @@ namespace Components
                         .tagChild(MUI::TextBuilder().tagFont(MUI::Font::Tiny).tagContents("Video Memory Size").object())
                         .tagChild(MUI::TextBuilder().tagFont(MUI::Font::Tiny).tagContents("Iterface").object())
                         .tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.chip).object())
-                        .tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.memorySize).object())
+                        .tagChild(MUI::TextBuilder()
+                                      .tagBackground(MUI::ImageOrBackground::Fill)
+                                      .tagFrame(MUI::Frame::String)
+                                      .tagContents(cgxBoard.memorySize)
+                                      .object())
                         .tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.interface).object())
                         .object());
             }

diff --git a/...rc/Components/Tabs/Graphics/CgxBoards.hpp → ...rc/Components/Tabs/Graphics/CGXBoards.hpp b/...rc/Components/Tabs/Graphics/CgxBoards.hpp → ...rc/Components/Tabs/Graphics/CGXBoards.hpp
@@ -13,12 +13,12 @@
 
 namespace Components
 {
-    class CgxBoards : public Root<MUI::Group>, public TabBase
+    class CGXBoards : public Root<MUI::Group>, public TabBase
     {
         MUI::Group mComponent;
 
       public:
-        CgxBoards();
+        CGXBoards();
 
       protected:
         MUI::Group &muiRoot() const

diff --git a/app/src/Components/Tabs/GraphicsTab.cpp b/app/src/Components/Tabs/GraphicsTab.cpp
@@ -8,7 +8,7 @@
 
 #include "AOS/Graphics/Library.hpp"
 #include "AOS/Identify/Library.hpp"
-#include "Graphics/CgxBoards.hpp"
+#include "Graphics/CGXBoards.hpp"
 #include "Graphics/P96Boards.hpp"
 #include "MUI/Core/MakeObject.hpp"
 #include "MUI/Core/NullObject.hpp"
@@ -34,7 +34,7 @@ namespace Components
               case AOS::Identify::IDGOS::PICASSO96:
                   return P96Boards();
               case AOS::Identify::IDGOS::CGX4:
-                  return CgxBoards();
+                  return CGXBoards();
               default:
                   return MUI::NullObject();
           }

diff --git a/app/src/DataInfo/GfxBoardSpec.cpp b/app/src/DataInfo/GfxBoardSpec.cpp
@@ -6,35 +6,45 @@
 
 #include "GfxBoardSpec.hpp"
 
+// data info resources:
+// https://amiga.resource.cx
+// https://bigbookofamigahardware.com
+
 namespace DataInfo
 {
     const std::map<AOS::Cybergraphics::BoardID, GfxBoardSpec> gfxBoard2spec {
-        { AOS::Cybergraphics::BoardID::CVision64,
-          { "CyberVision 64", "Phase 5 Digital Products, Germany", "S3 86C764 Trio64", "2/4 MB VRAM", 1995, "Zorro III" } },
+        { AOS::Cybergraphics::BoardID::CyberVision64,
+          { "CyberVision 64", "Phase 5 Digital Products, Germany", "S3 86C764 Trio64", "2/4 MB RAM", 1995, "Zorro III" } },
         { AOS::Cybergraphics::BoardID::Piccolo,
-          { "Piccolo", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5426", "1/2 MB VRAM", 1993, "Zorro II/III" } },
+          { "Piccolo", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5426", "1/2 MB RAM", 1993, "Zorro II/III" } },
         { AOS::Cybergraphics::BoardID::PicassoII,
-          { "Picasso II", "Village Tronic, Germany", "Cirrus Logic GD5426/GD5428", "1/2 MB VRAM", 1993, "Zorro II" } },
+          { "Picasso II", "Village Tronic, Germany", "Cirrus Logic GD5426/GD5428", "1/2 MB RAM", 1993, "Zorro II" } },
         { AOS::Cybergraphics::BoardID::Spectrum,
-          { "EGS 28/24 Spectrum", "Great Valley Products, USA", "Cirrus Logic GD5426 or GD 5428", "1/2 MB VRAM", 1993, "Zorro II/III" } },
+          { "EGS 28/24 Spectrum", "Great Valley Products, USA", "Cirrus Logic GD5426 or GD 5428", "1/2 MB RAM", 1993, "Zorro II/III" } },
         { AOS::Cybergraphics::BoardID::Domino,
-          { "Domino", "X-Pert Computer Services / Village Tronic, Germany", "Tseng Labs ET4000", "1 MB VRAM", 1992, "Zorro II" } },
-        { AOS::Cybergraphics::BoardID::RetinaZ3_DraCoAltais,
-          { "Retina BLT Z3", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB VRAM", 1994, "Zorro III" } },
+          { "Domino", "X-Pert Computer Services / Village Tronic, Germany", "Tseng Labs ET4000", "1 MB RAM", 1992, "Zorro II" } },
+        { AOS::Cybergraphics::BoardID::RetinaZ3,
+          { "Retina BLT Z3", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB RAM", 1994, "Zorro III" } },
+        { AOS::Cybergraphics::BoardID::DraCoAltais,
+          { "DraCoAltais", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB RAM", 1994, "Zorro III" } },
         { AOS::Cybergraphics::BoardID::PiccoSD64,
-          { "Picco SD64", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5434", "2/4 MB VRAM", 1995, "Zorro II/III" } },
-        { AOS::Cybergraphics::BoardID::A2410, { "A2410", "Commodore, USA", "Texas Instruments TMS34010", "2 MB VRAM", 1991, "Zorro II" } },
-        { AOS::Cybergraphics::BoardID::CVision3D,
-          { "CyberVision 64/3D", "Phase 5 Digital Products, Germany", "S3 ViRGE", "4 MB VRAM", 1996, "Zorro II/III" } },
+          { "Picco SD64", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5434", "2/4 MB RAM", 1995, "Zorro II/III" } },
+        { AOS::Cybergraphics::BoardID::A2410, { "A2410", "Commodore, USA", "Texas Instruments TMS34010", "2 MB RAM", 1991, "Zorro II" } },
+        { AOS::Cybergraphics::BoardID::CyberVision3D,
+          { "CyberVision 64/3D", "Phase 5 Digital Products, Germany", "S3 ViRGE", "4 MB RAM", 1996, "Zorro II/III" } },
         { AOS::Cybergraphics::BoardID::Inferno,
-          { "Inferno", "DKB, USA", "Cirrus Logic GD5446", "4 MB VRAM", 1997, "local PCI expansion bus" } },
+          { "Inferno", "DKB, USA", "Cirrus Logic GD5446", "4 MB RAM", 1997, "local PCI expansion bus" } },
         { AOS::Cybergraphics::BoardID::PicassoIV,
-          { "Picasso IV", "Village Tronic, Germany", "Cirrus Logic GD5446", "4 MB VRAM", 1996, "Zorro II/III" } },
+          { "Picasso IV", "Village Tronic, Germany", "Cirrus Logic GD5446", "4 MB RAM", 1996, "Zorro II/III" } },
+        { AOS::Cybergraphics::BoardID::Pixel64,
+          { "Pixel 64", "Ateo Concepts, France", "Cirrus Logic GD5434", "2 MB RAM", 1997, "AteoBus" } },
+        { AOS::Cybergraphics::BoardID::RainbowIII,
+          { "Rainbow III", "Ingenieurburo Helfrich, Germany", "Inmos G360/G364/G365", "4 MB RAM", 1994, "Zorro III" } },
         { AOS::Cybergraphics::BoardID::CyberVisonPPC,
-          { "CyberVison PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB VRAM", 1998,
+          { "CyberVison PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB RAM", 1998,
             "local PCI expansion bus" } },
-        { AOS::Cybergraphics::BoardID::BVisonPPC,
-          { "BlizzardVision PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB VRAM", 1998,
+        { AOS::Cybergraphics::BoardID::BlizzardVisionPPC,
+          { "BlizzardVision PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB RAM", 1998,
             "local PCI expansion bus" } },
     };
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export APP_VERSION = 0.2.1
		export APP_VERSION = 0.2.2