Skip to content

Commit 0d67cfd

Browse files
tdolphin-orgtdolphin-org
committed
refactor CGXBoards component, update DataInfo for CGX boards
1 parent 99db75e commit 0d67cfd

File tree

5 files changed

+39
-25
lines changed

5 files changed

+39
-25
lines changed

‎app/appversion.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export APP_VERSION = 0.2.1
1+
export APP_VERSION = 0.2.2

‎app/src/Components/Tabs/Graphics/CgxBoards.cpp ‎app/src/Components/Tabs/Graphics/CGXBoards.cpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// (c) 2024 TDolphin
55
//
66

7-
#include "CgxBoards.hpp"
7+
#include "CGXBoards.hpp"
88
#include "AppContext.hpp"
99

1010
#include "AOS/Cybergraphics/Library.hpp"
@@ -13,7 +13,7 @@
1313

1414
namespace Components
1515
{
16-
CgxBoards::CgxBoards()
16+
CGXBoards::CGXBoards()
1717
: mComponent(MUI::GroupBuilder()
1818
.tagFrame(MUI::Frame::Group)
1919
.tagBackground(MUI::ImageOrBackground::WindowBack)
@@ -56,7 +56,11 @@ namespace Components
5656
.tagChild(MUI::TextBuilder().tagFont(MUI::Font::Tiny).tagContents("Video Memory Size").object())
5757
.tagChild(MUI::TextBuilder().tagFont(MUI::Font::Tiny).tagContents("Iterface").object())
5858
.tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.chip).object())
59-
.tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.memorySize).object())
59+
.tagChild(MUI::TextBuilder()
60+
.tagBackground(MUI::ImageOrBackground::Fill)
61+
.tagFrame(MUI::Frame::String)
62+
.tagContents(cgxBoard.memorySize)
63+
.object())
6064
.tagChild(MUI::TextBuilder().tagFrame(MUI::Frame::String).tagContents(cgxBoard.interface).object())
6165
.object());
6266
}

‎app/src/Components/Tabs/Graphics/CgxBoards.hpp ‎app/src/Components/Tabs/Graphics/CGXBoards.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
namespace Components
1515
{
16-
class CgxBoards : public Root<MUI::Group>, public TabBase
16+
class CGXBoards : public Root<MUI::Group>, public TabBase
1717
{
1818
MUI::Group mComponent;
1919

2020
public:
21-
CgxBoards();
21+
CGXBoards();
2222

2323
protected:
2424
MUI::Group &muiRoot() const

‎app/src/Components/Tabs/GraphicsTab.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "AOS/Graphics/Library.hpp"
1010
#include "AOS/Identify/Library.hpp"
11-
#include "Graphics/CgxBoards.hpp"
11+
#include "Graphics/CGXBoards.hpp"
1212
#include "Graphics/P96Boards.hpp"
1313
#include "MUI/Core/MakeObject.hpp"
1414
#include "MUI/Core/NullObject.hpp"
@@ -34,7 +34,7 @@ namespace Components
3434
case AOS::Identify::IDGOS::PICASSO96:
3535
return P96Boards();
3636
case AOS::Identify::IDGOS::CGX4:
37-
return CgxBoards();
37+
return CGXBoards();
3838
default:
3939
return MUI::NullObject();
4040
}

‎app/src/DataInfo/GfxBoardSpec.cpp

+27-17
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,45 @@
66

77
#include "GfxBoardSpec.hpp"
88

9+
// data info resources:
10+
// https://amiga.resource.cx
11+
// https://bigbookofamigahardware.com
12+
913
namespace DataInfo
1014
{
1115
const std::map<AOS::Cybergraphics::BoardID, GfxBoardSpec> gfxBoard2spec {
12-
{ AOS::Cybergraphics::BoardID::CVision64,
13-
{ "CyberVision 64", "Phase 5 Digital Products, Germany", "S3 86C764 Trio64", "2/4 MB VRAM", 1995, "Zorro III" } },
16+
{ AOS::Cybergraphics::BoardID::CyberVision64,
17+
{ "CyberVision 64", "Phase 5 Digital Products, Germany", "S3 86C764 Trio64", "2/4 MB RAM", 1995, "Zorro III" } },
1418
{ AOS::Cybergraphics::BoardID::Piccolo,
15-
{ "Piccolo", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5426", "1/2 MB VRAM", 1993, "Zorro II/III" } },
19+
{ "Piccolo", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5426", "1/2 MB RAM", 1993, "Zorro II/III" } },
1620
{ AOS::Cybergraphics::BoardID::PicassoII,
17-
{ "Picasso II", "Village Tronic, Germany", "Cirrus Logic GD5426/GD5428", "1/2 MB VRAM", 1993, "Zorro II" } },
21+
{ "Picasso II", "Village Tronic, Germany", "Cirrus Logic GD5426/GD5428", "1/2 MB RAM", 1993, "Zorro II" } },
1822
{ AOS::Cybergraphics::BoardID::Spectrum,
19-
{ "EGS 28/24 Spectrum", "Great Valley Products, USA", "Cirrus Logic GD5426 or GD 5428", "1/2 MB VRAM", 1993, "Zorro II/III" } },
23+
{ "EGS 28/24 Spectrum", "Great Valley Products, USA", "Cirrus Logic GD5426 or GD 5428", "1/2 MB RAM", 1993, "Zorro II/III" } },
2024
{ AOS::Cybergraphics::BoardID::Domino,
21-
{ "Domino", "X-Pert Computer Services / Village Tronic, Germany", "Tseng Labs ET4000", "1 MB VRAM", 1992, "Zorro II" } },
22-
{ AOS::Cybergraphics::BoardID::RetinaZ3_DraCoAltais,
23-
{ "Retina BLT Z3", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB VRAM", 1994, "Zorro III" } },
25+
{ "Domino", "X-Pert Computer Services / Village Tronic, Germany", "Tseng Labs ET4000", "1 MB RAM", 1992, "Zorro II" } },
26+
{ AOS::Cybergraphics::BoardID::RetinaZ3,
27+
{ "Retina BLT Z3", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB RAM", 1994, "Zorro III" } },
28+
{ AOS::Cybergraphics::BoardID::DraCoAltais,
29+
{ "DraCoAltais", "MacroSystem, Germany", "NCR 77C32BLT", "4 MB RAM", 1994, "Zorro III" } },
2430
{ AOS::Cybergraphics::BoardID::PiccoSD64,
25-
{ "Picco SD64", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5434", "2/4 MB VRAM", 1995, "Zorro II/III" } },
26-
{ AOS::Cybergraphics::BoardID::A2410, { "A2410", "Commodore, USA", "Texas Instruments TMS34010", "2 MB VRAM", 1991, "Zorro II" } },
27-
{ AOS::Cybergraphics::BoardID::CVision3D,
28-
{ "CyberVision 64/3D", "Phase 5 Digital Products, Germany", "S3 ViRGE", "4 MB VRAM", 1996, "Zorro II/III" } },
31+
{ "Picco SD64", "Ingenieurburo Helfrich, Germany", "Cirrus Logic GD5434", "2/4 MB RAM", 1995, "Zorro II/III" } },
32+
{ AOS::Cybergraphics::BoardID::A2410, { "A2410", "Commodore, USA", "Texas Instruments TMS34010", "2 MB RAM", 1991, "Zorro II" } },
33+
{ AOS::Cybergraphics::BoardID::CyberVision3D,
34+
{ "CyberVision 64/3D", "Phase 5 Digital Products, Germany", "S3 ViRGE", "4 MB RAM", 1996, "Zorro II/III" } },
2935
{ AOS::Cybergraphics::BoardID::Inferno,
30-
{ "Inferno", "DKB, USA", "Cirrus Logic GD5446", "4 MB VRAM", 1997, "local PCI expansion bus" } },
36+
{ "Inferno", "DKB, USA", "Cirrus Logic GD5446", "4 MB RAM", 1997, "local PCI expansion bus" } },
3137
{ AOS::Cybergraphics::BoardID::PicassoIV,
32-
{ "Picasso IV", "Village Tronic, Germany", "Cirrus Logic GD5446", "4 MB VRAM", 1996, "Zorro II/III" } },
38+
{ "Picasso IV", "Village Tronic, Germany", "Cirrus Logic GD5446", "4 MB RAM", 1996, "Zorro II/III" } },
39+
{ AOS::Cybergraphics::BoardID::Pixel64,
40+
{ "Pixel 64", "Ateo Concepts, France", "Cirrus Logic GD5434", "2 MB RAM", 1997, "AteoBus" } },
41+
{ AOS::Cybergraphics::BoardID::RainbowIII,
42+
{ "Rainbow III", "Ingenieurburo Helfrich, Germany", "Inmos G360/G364/G365", "4 MB RAM", 1994, "Zorro III" } },
3343
{ AOS::Cybergraphics::BoardID::CyberVisonPPC,
34-
{ "CyberVison PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB VRAM", 1998,
44+
{ "CyberVison PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB RAM", 1998,
3545
"local PCI expansion bus" } },
36-
{ AOS::Cybergraphics::BoardID::BVisonPPC,
37-
{ "BlizzardVision PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB VRAM", 1998,
46+
{ AOS::Cybergraphics::BoardID::BlizzardVisionPPC,
47+
{ "BlizzardVision PPC", "Phase 5 Digital Products, Germany", "3D Labs & Texas Instruments: Permedia 2", "8 MB RAM", 1998,
3848
"local PCI expansion bus" } },
3949
};
4050
}

0 commit comments

Comments
 (0)