add ace 500, move franklin to it's own group, updated machine descriptions

python/machines.py

@@ -10,10 +10,13 @@ MACHINES = (
 	# laser family
 	"laser128", "laser2c", "las128ex", "las128e2", "laser128o",
 
+	# Franklin
+	"ace100", "ace500", "ace1000",
+
 	# IIe clones
 	"mprof3", "prav8c", "spectred", "tk3000",
 	# II clones
-	"ace100", "ace1000", "agat7", "agat9", "albert",
+	"agat7", "agat9", "albert",
 	"am100", "am64", "basis108", "craft2p",
 	"dodo", "elppa", "hkc8800a", "ivelultr",
 	"maxxi", "microeng", "prav82", "prav8m",

python/mkmachines.py

@@ -268,6 +268,7 @@ DEVICE_MEDIA = {
 	'35sd': 'floppy_3_5',
 	'midiin': 'midiin',
 	'midiout': 'midiout',
+	'aplcdsc': 'cdrom',
 	# 'null_modem': 'bitbanger',
 	# 'rs232_sync_io': 'bitbanger',
 }
@@ -286,6 +287,7 @@ DEVICE_EXCLUDE = set([
 	'px320a',
 	's1410',
 	'smoc501',
+	'cfp1080s',
 ])
 
 def make_device_options(slot):

python/mkmodels.py

@@ -15,7 +15,8 @@ apple2e_children = ["apple2e", "apple2ees", "apple2euk", "apple2ep", "apple2ee",
 apple2c_children = ["apple2c", "apple2cp"]
 apple2gs_children = ["apple2gsr0", "apple2gsr1", "apple2gs"]
 laser_children = ["laser2c", "laser128", "laser128o", "las128ex", "las128e2"]
-ii_clones_children = ["ace100", "ace1000", "albert",
+franklin_children = ["ace100", "ace500", "ace1000"]
+ii_clones_children = ["albert",
 	"am100", "am64", "basis108", "craft2p",
 	"dodo", "elppa", "hkc8800a", "ivelultr",
 	"maxxi", "microeng", "prav82", "prav8m",
@@ -41,6 +42,7 @@ tree = [
 	("Apple ///", "apple3", apple3_children),
 	("II Clones", None, ii_clones_children),
 	("IIe Clones", None, iie_clones_children),
+	("Franklin", None, franklin_children),
 	("Laser", "laser128", laser_children),
 	("Agat", "agat7", agat_children),
 	("China Education Computer", None, cec_children),