From be04b5a00bb92e848ba70e9df1310131c42df2ce Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 5 Sep 2020 10:59:38 -0400 Subject: [PATCH] apple2c was missing 5.25" drives. --- Ample/Resources/apple2c.plist | 2 ++ python/mkmachines.py | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Ample/Resources/apple2c.plist b/Ample/Resources/apple2c.plist index dd26801..ddb7e78 100644 --- a/Ample/Resources/apple2c.plist +++ b/Ample/Resources/apple2c.plist @@ -19,6 +19,8 @@ media + flop_5_25 + 2 resolution diff --git a/python/mkmachines.py b/python/mkmachines.py index 8cf0c39..4c71fea 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -26,8 +26,13 @@ def find_machine_media(parent): # not built in. Except the Apple3, where the floppy drives are actually slots 0/1/2/3/4 # # apple1 has a "snapshot" device. not currently supported. + # + # in the //c (but not //c+) the floppy drives are in slot 6 which doesn't otherwise exist. + # # no machines have built-in hard drives. + + mname = parent.get("name") remap = { "cassette": "cass", "apple1_cass": "cass", @@ -43,8 +48,23 @@ def find_machine_media(parent): if intf == None: intf = typ # cassette has no interface. # print(" ",intf) + + slot = None + if ':' in tag: + tt = tag.split(':') + if len(tt) >= 3: slot = tt[0] + # exclude: + # apple1 - tag="exp:cassette:cassette" + # apple2 - tag="sl6:diskiing:0:525" + # include: + # apple2c - tag="sl6:0:525" + # apple3 - tag="0:525" + + if mname == "apple2c" and slot == "sl6": slot = None + + if slot: continue # skip slot devices -- they'll be handled as part of the device. - if ":" in tag and tag[0] not in "0123456789": continue + #if ":" in tag and tag[0] not in "0123456789": continue if intf in remap: name = remap[intf]