Skip to content

Commit

Permalink
fix Atari rom names
Browse files Browse the repository at this point in the history
  • Loading branch information
ksherlock committed May 31, 2023
1 parent 9031b48 commit dc67db2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
24 changes: 12 additions & 12 deletions Ample/Resources/roms.plist
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,18 @@
<key>description</key>
<string>Asante MC3NB Ethernet card</string>
</dict>
<dict>
<key>value</key>
<string>megast</string>
<key>description</key>
<string>Atari MEGA ST (USA)</string>
</dict>
<dict>
<key>value</key>
<string>st</string>
<key>description</key>
<string>Atari ST (USA)</string>
</dict>
<dict>
<key>value</key>
<string>st_kbd</string>
Expand Down Expand Up @@ -698,12 +710,6 @@
<key>description</key>
<string>M&amp;R Enterprises SUP'R'TERMINAL</string>
</dict>
<dict>
<key>value</key>
<string>megast</string>
<key>description</key>
<string>MEGA ST (USA)</string>
</dict>
<dict>
<key>value</key>
<string>mac128k</string>
Expand Down Expand Up @@ -1028,12 +1034,6 @@
<key>description</key>
<string>RasterOps Colorboard 264/SE30</string>
</dict>
<dict>
<key>value</key>
<string>st</string>
<key>description</key>
<string>ST (USA)</string>
</dict>
<dict>
<key>value</key>
<string>swtpc8212_device</string>
Expand Down
4 changes: 2 additions & 2 deletions python/mkmachines.py
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ def make_smartport(machine):
"slots": slots
}

def fix_machine_description(x):
def fix_machine_description(x, devname):
#
x = x.replace(", www.dreher.net","")
return x
Expand All @@ -505,7 +505,7 @@ def make_slot(m, slotname, nodes):
default = x.get("default") == "yes"
disabled = name in DISABLED or (m, name) in DISABLED

d = { "value": name, "description": fix_machine_description(desc) } # "devname": devname or ''}
d = { "value": name, "description": fix_machine_description(desc, devname) } # "devname": devname or ''}
if default: d["default"] = True
if disabled: d["disabled"] = True
if not disabled:
Expand Down
5 changes: 3 additions & 2 deletions python/mkroms.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@

])

def fix_machine_description(x):
def fix_machine_description(x, devname):
# CFFA 2.0 Compact Flash (65C02 firmware, www.dreher.net)
x = x.replace(", www.dreher.net","")
if devname in ("st", "megast"): x = "Atari " + x
return x

def build_known_roms_list():
Expand Down Expand Up @@ -190,7 +191,7 @@ def handle_starttag(self, tag, attrs):

# if full: ROMS = list(mnames)
# else: ROMS = list(mnames.difference(EXCLUDE))
ROMS = [{ 'value': k, 'description': fix_machine_description(v)} for k, v in mnames.items()];
ROMS = [{ 'value': k, 'description': fix_machine_description(v, k)} for k, v in mnames.items()];
ROMS.sort(key=lambda x: x.get('description'))

# data = []
Expand Down

0 comments on commit dc67db2

Please sign in to comment.