From 75077e238f2e2435f53d5da66426af6b39fc4b13 Mon Sep 17 00:00:00 2001 From: Rob McMullen Date: Thu, 2 Jun 2016 22:58:11 -0700 Subject: [PATCH] Reordered cartridges --- atrcopy/cartridge.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/atrcopy/cartridge.py b/atrcopy/cartridge.py index 78283da..d6500f2 100644 --- a/atrcopy/cartridge.py +++ b/atrcopy/cartridge.py @@ -28,26 +28,33 @@ known_cart_types = [ (58, "Standard 4 KB", 4, 4, 0, 0xb000), (59, "Right slot 4 KB", 4, 4, 4, 0, 0x9000), (1, "Standard 8 KB", 8, 8, 0, 0xa000), + (21, "Right slot 8 KB", 8,), (2, "Standard 16 KB", 16, 16, 0, 0x8000), + (44, "OSS 8 KB", 8,), (15, "OSS one chip 16 KB", 16,), (3, "OSS two chip (034M) 16 KB", 16, 4, 12, 0xb000, 4, 0, 0xa000), (45, "OSS two chip (043M) 16 KB", 16, 4, 12, 0xb000, 4, 0, 0xa000), - (5, "DB 32 KB", 32,), - (8, "Williams 64 KB", 64,), - (9, "Express 64 KB", 64,), - (10, "Diamond 64 KB", 64,), - (11, "SpartaDOS X 64 KB", 64,), (12, "XEGS 32 KB", 32, 8, 24, 0xa000, 8, 0, 0x8000), (13, "XEGS (banks 0-7) 64 KB", 64, 8, 56, 0xa000, 8, 0, 0x8000), (67, "XEGS (banks 8-15) 64 KB", 64, 8, 56, 0xa000, 8, 0, 0x8000), (14, "XEGS 128 KB", 128, 8, 120, 0xa000, 8, 0, 0x8000), - (17, "Atrax 128 KB", 128,), - (18, "Bounty Bob 40 KB", 40,), - (21, "Right slot 8 KB", 8,), - (22, "Williams 32 KB", 32,), (23, "XEGS 256 KB", 256, 8, 248, 0xa000, 8, 0, 0x8000), (24, "XEGS 512 KB", 512, 8, 504, 0xa000, 8, 0, 0x8000), (25, "XEGS 1 MB", 1024, 8, 1016, 0xa000, 8, 0, 0x8000 ), + (33, "Switchable XEGS 32 KB", 32, 8, 24, 0xa000, 8, 0, 0x8000), + (34, "Switchable XEGS 64 KB", 64, 8, 56, 0xa000, 8, 0, 0x8000), + (35, "Switchable XEGS 128 KB", 128, 8, 120, 0xa000, 8, 0, 0x8000), + (36, "Switchable XEGS 256 KB", 256, 8, 248, 0xa000, 8, 0, 0x8000), + (37, "Switchable XEGS 512 KB", 512, 8, 504, 0xa000, 8, 0, 0x8000), + (38, "Switchable XEGS 1 MB", 1024, 8, 1016, 0xa000, 8, 0, 0x8000 ), + (22, "Williams 32 KB", 32,), + (8, "Williams 64 KB", 64,), + (9, "Express 64 KB", 64,), + (10, "Diamond 64 KB", 64,), + (11, "SpartaDOS X 64 KB", 64,), + (43, "SpartaDOS X 128 KB", 128,), + (17, "Atrax 128 KB", 128,), + (18, "Bounty Bob 40 KB", 40,), (26, "MegaCart 16 KB", 16,), (27, "MegaCart 32 KB", 32,), (28, "MegaCart 64 KB", 64,), @@ -55,19 +62,12 @@ known_cart_types = [ (30, "MegaCart 256 KB", 256,), (31, "MegaCart 512 KB", 512,), (32, "MegaCart 1 MB", 1024,), - (33, "Switchable XEGS 32 KB", 32, 8, 24, 0xa000, 8, 0, 0x8000), - (34, "Switchable XEGS 64 KB", 64, 8, 56, 0xa000, 8, 0, 0x8000), - (35, "Switchable XEGS 128 KB", 128, 8, 120, 0xa000, 8, 0, 0x8000), - (36, "Switchable XEGS 256 KB", 256, 8, 248, 0xa000, 8, 0, 0x8000), - (37, "Switchable XEGS 512 KB", 512, 8, 504, 0xa000, 8, 0, 0x8000), - (38, "Switchable XEGS 1 MB", 1024, 8, 1016, 0xa000, 8, 0, 0x8000 ), (39, "Phoenix 8 KB", 8,), + (46, "Blizzard 4 KB", 4,), (40, "Blizzard 16 KB", 16, 16, 0, 0x8000), + (60, "Blizzard 32 KB", 32,), (41, "Atarimax 128 KB Flash", 128,), (42, "Atarimax 1 MB Flash", 1024,), - (43, "SpartaDOS X 128 KB", 128,), - (44, "OSS 8 KB", 8,), - (46, "Blizzard 4 KB", 4,), (47, "AST 32 KB", 32,), (48, "Atrax SDX 64 KB", 64,), (49, "Atrax SDX 128 KB", 128,), @@ -75,10 +75,10 @@ known_cart_types = [ (51, "Turbosoft 128 KB", 128,), (52, "Ultracart 32 KB", 32,), (53, "Low bank 8 KB", 8, 8, 0, 0x8000), + (5, "DB 32 KB", 32,), (54, "SIC! 128 KB", 128,), (55, "SIC! 256 KB", 256,), (56, "SIC! 512 KB", 512,), - (60, "Blizzard 32 KB", 32,), (61, "MegaMax 2 MB", 2048,), (62, "The!Cart 128 MB", 128*1024,), (63, "Flash MegaCart 4 MB", 4096,),