Apple-2-Tools/ample
1
0
Fork 0
mirror of https://github.com/ksherlock/ample.git synced 2025-04-07 13:38:01 +00:00
Code Issues Projects Releases Wiki Activity

add c64 as well...

Browse Source
This commit is contained in:
Kelvin Sherlock 2025-01-14 21:21:26 -05:00
parent 39ccaba7b6
commit 9c4d8ea2d1
5 changed files with 327 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Ample/Resources/models.plist
View File

@ -850,27 +850,6 @@
</dict>
</array>
</dict>
<dict>
<key>description</key>
<string>Atari ST</string>
<key>value</key>
<string>st</string>
<key>children</key>
<array>
<dict>
<key>description</key>
<string>ST (USA)</string>
<key>value</key>
<string>st</string>
</dict>
<dict>
<key>description</key>
<string>MEGA ST (USA)</string>
<key>value</key>
<string>megast</string>
</dict>
</array>
</dict>
<dict>
<key>description</key>
<string>Acorn</string>
@ -944,6 +923,48 @@
</dict>
</array>
</dict>
<dict>
<key>description</key>
<string>Atari ST</string>
<key>value</key>
<string>st</string>
<key>children</key>
<array>
<dict>
<key>description</key>
<string>ST (USA)</string>
<key>value</key>
<string>st</string>
</dict>
<dict>
<key>description</key>
<string>MEGA ST (USA)</string>
<key>value</key>
<string>megast</string>
</dict>
</array>
</dict>
<dict>
<key>description</key>
<string>Commodore</string>
<key>value</key>
<string>c64</string>
<key>children</key>
<array>
<dict>
<key>description</key>
<string>Commodore 64 (NTSC)</string>
<key>value</key>
<string>c64</string>
</dict>
<dict>
<key>description</key>
<string>Commodore 64C (NTSC)</string>
<key>value</key>
<string>c64c</string>
</dict>
</array>
</dict>
<dict>
<key>description</key>
<string>Oric</string>

246
Ample/Resources/roms.plist
View File

@ -194,6 +194,12 @@
<key>description</key>
<string>Agat-9 140K Floppy Card</string>
</dict>
<dict>
<key>value</key>
<string>bluechip</string>
<key>description</key>
<string>Amtech Blue Chip Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>apple3</string>
@ -524,6 +530,42 @@
<key>description</key>
<string>Brigent BootBug Debugger Card</string>
</dict>
<dict>
<key>value</key>
<string>c64_buscard</string>
<key>description</key>
<string>C64 BusCard Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>c64_buscard2</string>
<key>description</key>
<string>C64 BusCard II Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>c64_cspeech</string>
<key>description</key>
<string>C64 Currah Speech</string>
</dict>
<dict>
<key>value</key>
<string>c64_mscr</string>
<key>description</key>
<string>C64 Multiscreen Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>c64_supercpu</string>
<key>description</key>
<string>C64 SuperCPU V2 + SuperRAM</string>
</dict>
<dict>
<key>value</key>
<string>c64_xl80</string>
<key>description</key>
<string>C64 XL 80 Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>ccs7710</string>
@ -548,6 +590,12 @@
<key>description</key>
<string>CFFA Compact Flash For Apple I</string>
</dict>
<dict>
<key>value</key>
<string>cmdhd</string>
<key>description</key>
<string>CMD HD</string>
</dict>
<dict>
<key>value</key>
<string>bbc_tube_cms6809</string>
@ -566,6 +614,12 @@
<key>description</key>
<string>COMX PL-80</string>
</dict>
<dict>
<key>value</key>
<string>csd1</string>
<key>description</key>
<string>CSD-1 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>bbc_cc500</string>
@ -686,6 +740,96 @@
<key>description</key>
<string>Color Computer 1/2</string>
</dict>
<dict>
<key>value</key>
<string>cmdrc2</string>
<key>description</key>
<string>Commander C-II Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1526</string>
<key>description</key>
<string>Commodore 1526/MPS-802 Dot Matrix Printer</string>
</dict>
<dict>
<key>value</key>
<string>c1540</string>
<key>description</key>
<string>Commodore 1540 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541</string>
<key>description</key>
<string>Commodore 1541 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541dd</string>
<key>description</key>
<string>Commodore 1541 Dolphin-DOS 2.0 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541pdc</string>
<key>description</key>
<string>Commodore 1541 ProLogic-DOS Classic Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541pd</string>
<key>description</key>
<string>Commodore 1541 Professional-DOS V1 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541ii</string>
<key>description</key>
<string>Commodore 1541-II Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1541c</string>
<key>description</key>
<string>Commodore 1541C Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1570</string>
<key>description</key>
<string>Commodore 1570 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1571</string>
<key>description</key>
<string>Commodore 1571 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c1581</string>
<key>description</key>
<string>Commodore 1581 3.5" Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>c64</string>
<key>description</key>
<string>Commodore 64 (NTSC)</string>
</dict>
<dict>
<key>value</key>
<string>mps1200</string>
<key>description</key>
<string>Commodore MPS-1200 Dot Matrix Printer</string>
</dict>
<dict>
<key>value</key>
<string>mps1250</string>
<key>description</key>
<string>Commodore MPS-1250 Dot Matrix Printer</string>
</dict>
<dict>
<key>value</key>
<string>bbc_integrab</string>
@ -746,6 +890,12 @@
<key>description</key>
<string>Darren Atkinson's MCX-128 Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>c64_z80videopak</string>
<key>description</key>
<string>Data20 Z80 Video Pak</string>
</dict>
<dict>
<key>value</key>
<string>coco_scii</string>
@ -818,6 +968,12 @@
<key>description</key>
<string>ElkSD64 Electron SD Interface</string>
</dict>
<dict>
<key>value</key>
<string>enh2000</string>
<key>description</key>
<string>Enhancer 2000 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>ap2000</string>
@ -842,6 +998,30 @@
<key>description</key>
<string>Epson LX-810L</string>
</dict>
<dict>
<key>value</key>
<string>fd2000</string>
<key>description</key>
<string>FD-2000 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>fd4000</string>
<key>description</key>
<string>FD-4000 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>fsd1</string>
<key>description</key>
<string>FSD-1 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>fsd2</string>
<key>description</key>
<string>FSD-2 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>pds30_emac</string>
@ -908,12 +1088,24 @@
<key>description</key>
<string>IBS AP-16 80 Column Card (Alt. Version)</string>
</dict>
<dict>
<key>value</key>
<string>minichif</string>
<key>description</key>
<string>ICT Mini Chief Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>ie15_device</string>
<key>description</key>
<string>IE15</string>
</dict>
<dict>
<key>value</key>
<string>indusgt</string>
<key>description</key>
<string>Indus GT Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>zip100_ide</string>
@ -974,6 +1166,18 @@
<key>description</key>
<string>MC-10</string>
</dict>
<dict>
<key>value</key>
<string>msdsd1</string>
<key>description</key>
<string>MSD SD-1 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>msdsd2</string>
<key>description</key>
<string>MSD SD-2 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>mac128k</string>
@ -1340,6 +1544,12 @@
<key>description</key>
<string>Oric-1</string>
</dict>
<dict>
<key>value</key>
<string>cbm_interpod</string>
<key>description</key>
<string>Oxford Computer Systems Interpod</string>
</dict>
<dict>
<key>value</key>
<string>electron_ap1</string>
@ -1442,6 +1652,12 @@
<key>description</key>
<string>Radius Two Page Display Video Card</string>
</dict>
<dict>
<key>value</key>
<string>fd148</string>
<key>description</key>
<string>Rapid Access FD-148 Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>nb_c264</string>
@ -1532,6 +1748,12 @@
<key>description</key>
<string>Seikou Excel-9</string>
</dict>
<dict>
<key>value</key>
<string>cbm_serbox</string>
<key>description</key>
<string>Serial Box</string>
</dict>
<dict>
<key>value</key>
<string>pd3_lviw</string>
@ -1652,6 +1874,12 @@
<key>description</key>
<string>Sprow ARM7TDMI Co-Processor</string>
</dict>
<dict>
<key>value</key>
<string>c64_nl10</string>
<key>description</key>
<string>Star NL-10 C64 Interface Cartridge</string>
</dict>
<dict>
<key>value</key>
<string>a2q68</string>
@ -1736,6 +1964,18 @@
<key>description</key>
<string>Unknown Videoterm Clone</string>
</dict>
<dict>
<key>value</key>
<string>vic1515</string>
<key>description</key>
<string>VIC-1515 Graphic Printer</string>
</dict>
<dict>
<key>value</key>
<string>vic1520</string>
<key>description</key>
<string>VIC-1520 Color Printer Plotter</string>
</dict>
<dict>
<key>value</key>
<string>a2ultrme</string>
@ -1790,6 +2030,12 @@
<key>description</key>
<string>Watford Electronics DDB3 1770 FDC</string>
</dict>
<dict>
<key>value</key>
<string>technica</string>
<key>description</key>
<string>Westfalia Technica Disk Drive</string>
</dict>
<dict>
<key>value</key>
<string>electron_sidewndr</string>

21
python/machines.py
View File

@ -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",

26
python/mkmachines.py
View File

@ -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]

7
python/mkmodels.py
View File

@ -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),