From 9c4d8ea2d16272b485500e24d0b9867e0fbd8a13 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Tue, 14 Jan 2025 21:21:26 -0500 Subject: [PATCH] add c64 as well... --- Ample/Resources/models.plist | 63 ++++++--- Ample/Resources/roms.plist | 246 +++++++++++++++++++++++++++++++++++ python/machines.py | 21 ++- python/mkmachines.py | 26 +++- python/mkmodels.py | 7 +- 5 files changed, 327 insertions(+), 36 deletions(-) diff --git a/Ample/Resources/models.plist b/Ample/Resources/models.plist index a5fe2f2..8c70ae3 100644 --- a/Ample/Resources/models.plist +++ b/Ample/Resources/models.plist @@ -850,27 +850,6 @@ - - description - Atari ST - value - st - children - - - description - ST (USA) - value - st - - - description - MEGA ST (USA) - value - megast - - - description Acorn @@ -944,6 +923,48 @@ + + description + Atari ST + value + st + children + + + description + ST (USA) + value + st + + + description + MEGA ST (USA) + value + megast + + + + + description + Commodore + value + c64 + children + + + description + Commodore 64 (NTSC) + value + c64 + + + description + Commodore 64C (NTSC) + value + c64c + + + description Oric diff --git a/Ample/Resources/roms.plist b/Ample/Resources/roms.plist index d4476fa..44df9d1 100644 --- a/Ample/Resources/roms.plist +++ b/Ample/Resources/roms.plist @@ -194,6 +194,12 @@ description Agat-9 140K Floppy Card + + value + bluechip + description + Amtech Blue Chip Disk Drive + value apple3 @@ -524,6 +530,42 @@ description Brigent BootBug Debugger Card + + value + c64_buscard + description + C64 BusCard Cartridge + + + value + c64_buscard2 + description + C64 BusCard II Cartridge + + + value + c64_cspeech + description + C64 Currah Speech + + + value + c64_mscr + description + C64 Multiscreen Cartridge + + + value + c64_supercpu + description + C64 SuperCPU V2 + SuperRAM + + + value + c64_xl80 + description + C64 XL 80 Cartridge + value ccs7710 @@ -548,6 +590,12 @@ description CFFA Compact Flash For Apple I + + value + cmdhd + description + CMD HD + value bbc_tube_cms6809 @@ -566,6 +614,12 @@ description COMX PL-80 + + value + csd1 + description + CSD-1 Disk Drive + value bbc_cc500 @@ -686,6 +740,96 @@ description Color Computer 1/2 + + value + cmdrc2 + description + Commander C-II Disk Drive + + + value + c1526 + description + Commodore 1526/MPS-802 Dot Matrix Printer + + + value + c1540 + description + Commodore 1540 Disk Drive + + + value + c1541 + description + Commodore 1541 Disk Drive + + + value + c1541dd + description + Commodore 1541 Dolphin-DOS 2.0 Disk Drive + + + value + c1541pdc + description + Commodore 1541 ProLogic-DOS Classic Disk Drive + + + value + c1541pd + description + Commodore 1541 Professional-DOS V1 Disk Drive + + + value + c1541ii + description + Commodore 1541-II Disk Drive + + + value + c1541c + description + Commodore 1541C Disk Drive + + + value + c1570 + description + Commodore 1570 Disk Drive + + + value + c1571 + description + Commodore 1571 Disk Drive + + + value + c1581 + description + Commodore 1581 3.5" Disk Drive + + + value + c64 + description + Commodore 64 (NTSC) + + + value + mps1200 + description + Commodore MPS-1200 Dot Matrix Printer + + + value + mps1250 + description + Commodore MPS-1250 Dot Matrix Printer + value bbc_integrab @@ -746,6 +890,12 @@ description Darren Atkinson's MCX-128 Cartridge + + value + c64_z80videopak + description + Data20 Z80 Video Pak + value coco_scii @@ -818,6 +968,12 @@ description ElkSD64 Electron SD Interface + + value + enh2000 + description + Enhancer 2000 Disk Drive + value ap2000 @@ -842,6 +998,30 @@ description Epson LX-810L + + value + fd2000 + description + FD-2000 Disk Drive + + + value + fd4000 + description + FD-4000 Disk Drive + + + value + fsd1 + description + FSD-1 Disk Drive + + + value + fsd2 + description + FSD-2 Disk Drive + value pds30_emac @@ -908,12 +1088,24 @@ description IBS AP-16 80 Column Card (Alt. Version) + + value + minichif + description + ICT Mini Chief Disk Drive + value ie15_device description IE15 + + value + indusgt + description + Indus GT Disk Drive + value zip100_ide @@ -974,6 +1166,18 @@ description MC-10 + + value + msdsd1 + description + MSD SD-1 Disk Drive + + + value + msdsd2 + description + MSD SD-2 Disk Drive + value mac128k @@ -1340,6 +1544,12 @@ description Oric-1 + + value + cbm_interpod + description + Oxford Computer Systems Interpod + value electron_ap1 @@ -1442,6 +1652,12 @@ description Radius Two Page Display Video Card + + value + fd148 + description + Rapid Access FD-148 Disk Drive + value nb_c264 @@ -1532,6 +1748,12 @@ description Seikou Excel-9 + + value + cbm_serbox + description + Serial Box + value pd3_lviw @@ -1652,6 +1874,12 @@ description Sprow ARM7TDMI Co-Processor + + value + c64_nl10 + description + Star NL-10 C64 Interface Cartridge + value a2q68 @@ -1736,6 +1964,18 @@ description Unknown Videoterm Clone + + value + vic1515 + description + VIC-1515 Graphic Printer + + + value + vic1520 + description + VIC-1520 Color Printer Plotter + value a2ultrme @@ -1790,6 +2030,12 @@ description Watford Electronics DDB3 1770 FDC + + value + technica + description + Westfalia Technica Disk Drive + value electron_sidewndr diff --git a/python/machines.py b/python/machines.py index 6926eba..5feb6c1 100644 --- a/python/machines.py +++ b/python/machines.py @@ -51,23 +51,31 @@ MACHINES = ( # 128k clones # "unitron", "utrn1024", + + # acorn + "bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron", + #atari "st", "megast", + + # commodore + "c64", "c64c", + + # oric + "oric1", "orica", "prav8d", "telstrat", + # mt65, micron, mt6809 -- need tanbus support... + + # trs "coco", "coco2b", "coco3", "coco3p", "mc10", "cocoh", "coco3h", "coco2bh", "trs80", "trs80l2", "dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64", - # oric - "oric1", "orica", "prav8d", "telstrat", - # mt65, micron, mt6809 -- need tanbus support... - # acorn - "bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron", ) @@ -77,8 +85,7 @@ MACHINES_EXTRA = MACHINES + ( # other (for Ample-lite...) # commodore - "c64", "c64c", "c128", - + "c128", # amiga "a500", "a500n", "a1000", "a1000n", "a2000", "a2000n", diff --git a/python/mkmachines.py b/python/mkmachines.py index d89be68..e14322c 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -691,13 +691,29 @@ def find_machine_resolution(machine): hscale = 1 wscale = 1 - # mame height is often garbage. - # raster screens have a default aspect ratio of 4 : 3 - # pre-calc something like that, but integer-based. + # bbc... + + # mode us euro + # (xml) 640x200 640x256 + # 0 640x220 (200) 640x282 (256) + # 1 320x220 320x282 + # 2 160x220 160x282 + # 3 640x218 (198) 640x275 (250) + # 4 320x220 320x282 + # 5 160x220 160x282 + # 6 320x218 320x275 + # 7 480x440 (400) 480x550 (500) + # + # mode 3/6/7 are strictly text modes so pixel values aren't comparable + # + 10% for layout UI? + + # + # if name == "electron" or name[:3] == "bbc": + # if width == 640: width = 480 + # if height == 200: height = 400 # us + # if height == 256: height = 500 # euro - #hscale = round((width * 3 / 4 ) / height) - #if hscale < 1 : hscale = 1 return [width, height * hscale] diff --git a/python/mkmodels.py b/python/mkmodels.py index 8967a76..d36b1ec 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -72,7 +72,8 @@ oric_children = [ amiga_children = ["a500", "a500n", "a1000", "a1000n", "a2000", "a2000n" ] acorn_children = [ "bbcb", "bbca", "bbcb_de", "bbcb_us", "bbcb_no", "bbcbp", "bbcbp128", "bbcm", "bbcmt", "bbcmc", "electron" ] -commodore_children = ["c64", "c64c", "c128"] +commodore_children = ["c64", "c64c"] +commodore_children_extra = ["c64", "c64c", "c128"] dec_vt_children = ["vt52", "vt100", "vt101", "vt102", "vt240"] dec_children = ["ds2100", "ds3100", "ds5k133", "pdp11qb", "pdp11ub", "pdp11ub2"] @@ -108,15 +109,15 @@ TREE = [ ("Macintosh (LC)", None, mac_lc_children), ("Macintosh (Portable)", None, mac_portable_children), ("Macintosh (PowerBook)", None, mac_powerbook_children), - ("Atari ST", "st", atari_st_children), ("Acorn", None, acorn_children), + ("Atari ST", "st", atari_st_children), + ("Commodore", "c64", commodore_children), ("Oric", None, oric_children), ("Tandy", None, tandy_children), ] TREE_EXTRA = TREE + [ ("Amiga", None, amiga_children), - ("Commodore", "c64", commodore_children), ("DEC VT", None, dec_vt_children), ("DEC", None, dec_children), ("HP 9000", None, hp_9000_children),