From c58ff589dda9016b00dc7233c7755b455e9574aa Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Mon, 18 Mar 2024 13:17:53 -0400 Subject: [PATCH] Add oric. --- Ample.xcodeproj/project.pbxproj | 24 ++ Ample/Resources/oric1.plist | 419 ++++++++++++++++++++++++ Ample/Resources/orica.plist | 551 ++++++++++++++++++++++++++++++++ Ample/Resources/prav8d.plist | 390 ++++++++++++++++++++++ Ample/Resources/telstrat.plist | 508 +++++++++++++++++++++++++++++ python/machines.py | 9 +- python/mkmachines.py | 11 +- python/mkmodels.py | 7 +- 8 files changed, 1915 insertions(+), 4 deletions(-) create mode 100644 Ample/Resources/oric1.plist create mode 100644 Ample/Resources/orica.plist create mode 100644 Ample/Resources/prav8d.plist create mode 100644 Ample/Resources/telstrat.plist diff --git a/Ample.xcodeproj/project.pbxproj b/Ample.xcodeproj/project.pbxproj index 5c3616f..34c794c 100644 --- a/Ample.xcodeproj/project.pbxproj +++ b/Ample.xcodeproj/project.pbxproj @@ -518,6 +518,14 @@ B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6F7B536266FDA5B00624C6B /* MachineView.xib */; }; B6F7B53C267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; }; B6F7B53D267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; }; + B6FECDD02BA8AA080025B402 /* prav8d.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCC2BA8AA080025B402 /* prav8d.plist */; }; + B6FECDD12BA8AA080025B402 /* prav8d.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCC2BA8AA080025B402 /* prav8d.plist */; }; + B6FECDD22BA8AA080025B402 /* telstrat.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCD2BA8AA080025B402 /* telstrat.plist */; }; + B6FECDD32BA8AA080025B402 /* telstrat.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCD2BA8AA080025B402 /* telstrat.plist */; }; + B6FECDD42BA8AA080025B402 /* orica.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCE2BA8AA080025B402 /* orica.plist */; }; + B6FECDD52BA8AA080025B402 /* orica.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCE2BA8AA080025B402 /* orica.plist */; }; + B6FECDD62BA8AA080025B402 /* oric1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCF2BA8AA080025B402 /* oric1.plist */; }; + B6FECDD72BA8AA080025B402 /* oric1.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6FECDCF2BA8AA080025B402 /* oric1.plist */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -932,6 +940,10 @@ B6F7B53A267017A200624C6B /* NewMachineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewMachineViewController.h; sourceTree = ""; }; B6F7B53B267017A200624C6B /* NewMachineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewMachineViewController.m; sourceTree = ""; }; B6FECAFA28C0093600E143DA /* las3000.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = las3000.plist; sourceTree = ""; }; + B6FECDCC2BA8AA080025B402 /* prav8d.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = prav8d.plist; sourceTree = ""; }; + B6FECDCD2BA8AA080025B402 /* telstrat.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = telstrat.plist; sourceTree = ""; }; + B6FECDCE2BA8AA080025B402 /* orica.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = orica.plist; sourceTree = ""; }; + B6FECDCF2BA8AA080025B402 /* oric1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = oric1.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1130,6 +1142,10 @@ B6896E082B016CE000251FA4 /* vt102.plist */, B6896DEA2B016CD800251FA4 /* vt240.plist */, B6896DCD2B016CD100251FA4 /* zijini.plist */, + B6FECDCF2BA8AA080025B402 /* oric1.plist */, + B6FECDCE2BA8AA080025B402 /* orica.plist */, + B6FECDCC2BA8AA080025B402 /* prav8d.plist */, + B6FECDCD2BA8AA080025B402 /* telstrat.plist */, B6EEFAAD2B9ABCAD0068B47C /* coco.plist */, B6EEFAAC2B9ABCAD0068B47C /* coco2b.plist */, B6EEFAA92B9ABCAD0068B47C /* coco3.plist */, @@ -1568,6 +1584,7 @@ B67878C82B01732700CFACF2 /* tk3000.plist in Resources */, B678787E2B01732700CFACF2 /* ds3100.plist in Resources */, B67878BA2B01732700CFACF2 /* pi4d35.plist in Resources */, + B6FECDD42BA8AA080025B402 /* orica.plist in Resources */, B67878C42B01732700CFACF2 /* rtpc020.plist in Resources */, B6DDECD62505A86E0093587A /* eject-16x16.png in Resources */, B678788C2B01732700CFACF2 /* indigo2_4415.plist in Resources */, @@ -1668,6 +1685,7 @@ B67878C02B01732700CFACF2 /* rs2030.plist in Resources */, B67878C22B01732700CFACF2 /* rtpc010.plist in Resources */, B67878BE2B01732700CFACF2 /* roms.plist in Resources */, + B6FECDD02BA8AA080025B402 /* prav8d.plist in Resources */, B678786D2B01732700CFACF2 /* am100.plist in Resources */, B6EEFAC02B9ABCAE0068B47C /* coco.plist in Resources */, B67878E02B01732700CFACF2 /* craft2p.plist in Resources */, @@ -1747,6 +1765,7 @@ B67878A82B01732700CFACF2 /* maclc575.plist in Resources */, B67878FF2B01732700CFACF2 /* uniap2ti.plist in Resources */, B67878CF2B01732700CFACF2 /* zijini.plist in Resources */, + B6FECDD22BA8AA080025B402 /* telstrat.plist in Resources */, B67878A92B01732700CFACF2 /* macplus.plist in Resources */, B6EEFABC2B9ABCAE0068B47C /* trs80l2.plist in Resources */, B67878912B01732700CFACF2 /* ip2400.plist in Resources */, @@ -1761,6 +1780,7 @@ B6D6DE3B24FACF4F00661A5F /* Defaults.plist in Resources */, B67878F92B01732700CFACF2 /* models.plist in Resources */, B67878952B01732700CFACF2 /* ip6000.plist in Resources */, + B6FECDD62BA8AA080025B402 /* oric1.plist in Resources */, B67878A62B01732700CFACF2 /* maclc3p.plist in Resources */, B67878A22B01732700CFACF2 /* maciihmu.plist in Resources */, ); @@ -1849,6 +1869,7 @@ B67878192B01732600CFACF2 /* models~extra.plist in Resources */, B67877D72B01732600CFACF2 /* apple2.plist in Resources */, B67878072B01732600CFACF2 /* maccclas.plist in Resources */, + B6FECDD12BA8AA080025B402 /* prav8d.plist in Resources */, B678783F2B01732600CFACF2 /* apple2e.plist in Resources */, B67877DD2B01732600CFACF2 /* apple2gsr1.plist in Resources */, B678781E2B01732600CFACF2 /* pdp11ub.plist in Resources */, @@ -1894,6 +1915,7 @@ B67879162B0195DB00CFACF2 /* sun3_50.plist in Resources */, B67878322B01732600CFACF2 /* uniap2pt.plist in Resources */, B6DE323926044C1100418375 /* caution.png in Resources */, + B6FECDD72BA8AA080025B402 /* oric1.plist in Resources */, B678783A2B01732600CFACF2 /* ace2200.plist in Resources */, B6DE323726044C1100418375 /* caution@2x.png in Resources */, B67877F42B01732600CFACF2 /* indigo.plist in Resources */, @@ -1904,6 +1926,7 @@ B6EEFAC52B9ABCAE0068B47C /* dragon32.plist in Resources */, B67878212B01732600CFACF2 /* pi4d25.plist in Resources */, B67878582B01732600CFACF2 /* maclc3.plist in Resources */, + B6FECDD32BA8AA080025B402 /* telstrat.plist in Resources */, B67878202B01732600CFACF2 /* pi4d20.plist in Resources */, B67878112B01732600CFACF2 /* maclc575.plist in Resources */, B6EEFABB2B9ABCAE0068B47C /* trs80.plist in Resources */, @@ -1950,6 +1973,7 @@ B67877DF2B01732600CFACF2 /* basis108.plist in Resources */, B67878132B01732600CFACF2 /* macqd610.plist in Resources */, B67878542B01732600CFACF2 /* maciicx.plist in Resources */, + B6FECDD52BA8AA080025B402 /* orica.plist in Resources */, B636F5D12B1168C00063F9D8 /* electron.plist in Resources */, B63C1B9725008A2700511A71 /* DownloadWindow.xib in Resources */, B6E4B5D324FDE2670094A35C /* MainMenu.xib in Resources */, diff --git a/Ample/Resources/oric1.plist b/Ample/Resources/oric1.plist new file mode 100644 index 0000000..c2bf07c --- /dev/null +++ b/Ample/Resources/oric1.plist @@ -0,0 +1,419 @@ + + + + + value + oric1 + description + Oric-1 + media + + + resolution + + 240 + 224 + + slots + + + name + bios + description + ROM + options + + + value + + description + —Default— + default + + + + value + ver10 + description + Basic 1.0 + + + value + ver10uk + description + Basic 1.0 UK + + + + + name + centronics + description + Printer + options + + + value + + description + —None— + default + + + + value + printer + description + Centronics Printer + default + + devname + centronics_printer + + + value + pl80 + description + COMX PL-80 + devname + comx_pl80 + + + value + covox_stereo + description + Covox (Stereo-in-1) + devname + covox_stereo + + + value + covox + description + Covox Speech Thing + devname + covox + + + value + digiblst + description + Digiblaster (DIY) + devname + cpcdigiblst + + + value + ap2000 + description + Epson ActionPrinter 2000 + devname + ap2000 + + + value + ex800 + description + Epson EX-800 + devname + ex800 + + + value + lx800 + description + Epson LX-800 + devname + lx800 + + + value + lx810l + description + Epson LX-810L + devname + lx810l + + + value + p72 + description + NEC PinWriter P72 + devname + p72 + + + value + samdac + description + SAMDAC + devname + centronics_samdac + + + value + nlq401 + description + Schneider NLQ 401 Matrix Printer + devname + nlq401 + + + value + chessmec + description + Tasc ChessMachine EC Interface + devname + centronics_chessmec + + + value + smartboard + description + Tasc SmartBoard SB30 Interface + devname + centronics_smartboard + + + + + name + ext + description + Expansion + options + + + value + + description + —None— + default + + + + value + jasmin + description + Jasmin Floppy Drive Interface + devname + oric_jasmin + + + value + microdisc + description + Microdisc Floppy Drive Interface + devname + oric_microdisc + + + + + devices + + + name + oric_jasmin + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + name + oric_microdisc + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + software + + oric1_cass.xml + + + diff --git a/Ample/Resources/orica.plist b/Ample/Resources/orica.plist new file mode 100644 index 0000000..0bb7b6e --- /dev/null +++ b/Ample/Resources/orica.plist @@ -0,0 +1,551 @@ + + + + + value + orica + description + Oric Atmos + media + + + resolution + + 240 + 224 + + slots + + + name + bios + description + ROM + options + + + value + + description + —Default— + default + + + + value + ver11 + description + Basic 1.1 + + + value + ver12 + description + Basic 1.2 (Pascal Leclerc) + + + value + ver121 + description + Basic 1.21 (Pascal Leclerc) + + + value + ver122 + description + Basic 1.22 (Pascal Leclerc) + + + value + ver11de + description + Basic 1.1 DE + + + value + ver11es + description + Basic 1.1 ES + + + value + ver11fr + description + Basic 1.1 FR + + + value + ver11se + description + Basic 1.1 SE + + + value + ver11uk + description + Basic 1.1 UK + + + value + ver12es + description + Basic 1.2 ES + + + value + ver12fr + description + Basic 1.2 FR + + + value + ver12ge + description + Basic 1.2 GE + + + value + ver12sw + description + Basic 1.2 SW + + + value + ver12uk + description + Basic 1.2 UK + + + value + ver121es + description + Basic 1.211 ES + + + value + ver121fr + description + Basic 1.211 FR + + + value + ver121ge + description + Basic 1.211 GE + + + value + ver121sw + description + Basic 1.211 SW + + + value + ver121uk + description + Basic 1.211 UK + + + value + ver122es + description + Basic 1.22 ES + + + value + ver122fr + description + Basic 1.22 FR + + + value + ver122ge + description + Basic 1.22 GE + + + value + ver122sw + description + Basic 1.22 SW + + + value + ver122uk + description + Basic 1.22 UK + + + + + name + centronics + description + Printer + options + + + value + + description + —None— + default + + + + value + printer + description + Centronics Printer + default + + devname + centronics_printer + + + value + pl80 + description + COMX PL-80 + devname + comx_pl80 + + + value + covox_stereo + description + Covox (Stereo-in-1) + devname + covox_stereo + + + value + covox + description + Covox Speech Thing + devname + covox + + + value + digiblst + description + Digiblaster (DIY) + devname + cpcdigiblst + + + value + ap2000 + description + Epson ActionPrinter 2000 + devname + ap2000 + + + value + ex800 + description + Epson EX-800 + devname + ex800 + + + value + lx800 + description + Epson LX-800 + devname + lx800 + + + value + lx810l + description + Epson LX-810L + devname + lx810l + + + value + p72 + description + NEC PinWriter P72 + devname + p72 + + + value + samdac + description + SAMDAC + devname + centronics_samdac + + + value + nlq401 + description + Schneider NLQ 401 Matrix Printer + devname + nlq401 + + + value + chessmec + description + Tasc ChessMachine EC Interface + devname + centronics_chessmec + + + value + smartboard + description + Tasc SmartBoard SB30 Interface + devname + centronics_smartboard + + + + + name + ext + description + Expansion + options + + + value + + description + —None— + default + + + + value + jasmin + description + Jasmin Floppy Drive Interface + devname + oric_jasmin + + + value + microdisc + description + Microdisc Floppy Drive Interface + devname + oric_microdisc + + + + + devices + + + name + oric_jasmin + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + name + oric_microdisc + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + software + + oric1_cass.xml + + + diff --git a/Ample/Resources/prav8d.plist b/Ample/Resources/prav8d.plist new file mode 100644 index 0000000..ccabc94 --- /dev/null +++ b/Ample/Resources/prav8d.plist @@ -0,0 +1,390 @@ + + + + + value + prav8d + description + Pravetz 8D + media + + + resolution + + 240 + 224 + + slots + + + name + centronics + description + Printer + options + + + value + + description + —None— + default + + + + value + printer + description + Centronics Printer + default + + devname + centronics_printer + + + value + pl80 + description + COMX PL-80 + devname + comx_pl80 + + + value + covox_stereo + description + Covox (Stereo-in-1) + devname + covox_stereo + + + value + covox + description + Covox Speech Thing + devname + covox + + + value + digiblst + description + Digiblaster (DIY) + devname + cpcdigiblst + + + value + ap2000 + description + Epson ActionPrinter 2000 + devname + ap2000 + + + value + ex800 + description + Epson EX-800 + devname + ex800 + + + value + lx800 + description + Epson LX-800 + devname + lx800 + + + value + lx810l + description + Epson LX-810L + devname + lx810l + + + value + p72 + description + NEC PinWriter P72 + devname + p72 + + + value + samdac + description + SAMDAC + devname + centronics_samdac + + + value + nlq401 + description + Schneider NLQ 401 Matrix Printer + devname + nlq401 + + + value + chessmec + description + Tasc ChessMachine EC Interface + devname + centronics_chessmec + + + value + smartboard + description + Tasc SmartBoard SB30 Interface + devname + centronics_smartboard + + + + + name + ext + description + Expansion + options + + + value + + description + —None— + default + + + + value + jasmin + description + Jasmin Floppy Drive Interface + devname + oric_jasmin + + + value + microdisc + description + Microdisc Floppy Drive Interface + devname + oric_microdisc + + + + + devices + + + name + oric_jasmin + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + name + oric_microdisc + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + software + + oric1_cass.xml + + + diff --git a/Ample/Resources/telstrat.plist b/Ample/Resources/telstrat.plist new file mode 100644 index 0000000..aea4222 --- /dev/null +++ b/Ample/Resources/telstrat.plist @@ -0,0 +1,508 @@ + + + + + value + telstrat + description + Oric Telestrat + media + + + resolution + + 240 + 224 + + slots + + + name + smartport + description + Disk Drives + options + + + value + + description + + devname + smartport + default + + + + + + name + centronics + description + Printer + options + + + value + + description + —None— + default + + + + value + printer + description + Centronics Printer + default + + devname + centronics_printer + + + value + pl80 + description + COMX PL-80 + devname + comx_pl80 + + + value + covox_stereo + description + Covox (Stereo-in-1) + devname + covox_stereo + + + value + covox + description + Covox Speech Thing + devname + covox + + + value + digiblst + description + Digiblaster (DIY) + devname + cpcdigiblst + + + value + ap2000 + description + Epson ActionPrinter 2000 + devname + ap2000 + + + value + ex800 + description + Epson EX-800 + devname + ex800 + + + value + lx800 + description + Epson LX-800 + devname + lx800 + + + value + lx810l + description + Epson LX-810L + devname + lx810l + + + value + p72 + description + NEC PinWriter P72 + devname + p72 + + + value + samdac + description + SAMDAC + devname + centronics_samdac + + + value + nlq401 + description + Schneider NLQ 401 Matrix Printer + devname + nlq401 + + + value + chessmec + description + Tasc ChessMachine EC Interface + devname + centronics_chessmec + + + value + smartboard + description + Tasc SmartBoard SB30 Interface + devname + centronics_smartboard + + + + + name + ext + description + Expansion + options + + + value + + description + —None— + default + + + + value + jasmin + description + Jasmin Floppy Drive Interface + devname + oric_jasmin + + + value + microdisc + description + Microdisc Floppy Drive Interface + devname + oric_microdisc + + + + + devices + + + name + smartport + slots + + + name + fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + name + oric_jasmin + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + name + oric_microdisc + slots + + + name + :fdc:0 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:1 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:2 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + name + :fdc:3 + options + + + value + + description + —None— + default + + + + value + 3dsdd + description + 3" double-sided floppy drive + default + + + + + + + + software + + oric1_cass.xml + + + diff --git a/python/machines.py b/python/machines.py index 5fbd99e..d65ee14 100644 --- a/python/machines.py +++ b/python/machines.py @@ -50,6 +50,10 @@ MACHINES = ( "trs80", "trs80l2", "dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64", + # oric + "oric1", "orica", "prav8d", "telstrat", + # mt65, micron, mt6809 -- need tanbus support... + ) @@ -208,9 +212,12 @@ SLOT_NAMES = { "fdc": "Disk Drives", - "ext": "Coco Cart", + # "ext": "Coco Cart", + "ext": "Expansion", "floppy0": "Floppy 1", "floppy1": "Floppy 2", "floppy2": "Floppy 3", "floppy3": "Floppy 4", } + + diff --git a/python/mkmachines.py b/python/mkmachines.py index 9b9078d..68f9925 100644 --- a/python/mkmachines.py +++ b/python/mkmachines.py @@ -45,6 +45,7 @@ import mame # + # don't allow these for now. generally because they add floppy/hard drives # but don't work with normal disk images DISABLED = set(( @@ -315,9 +316,11 @@ DEVICE_MEDIA = { 'hdd': 'hard', 'harddisk': 'hard', '525': 'floppy_5_25', - '35hd': 'floppy_3_5', '35dd': 'floppy_3_5', + '35ed': 'floppy_3_5', + '35hd': 'floppy_3_5', '35sd': 'floppy_3_5', + '35ssdd': 'floppy_3_5', 'midiin': 'midiin', 'midiout': 'midiout', 'aplcdsc': 'cdrom', @@ -339,7 +342,11 @@ DEVICE_MEDIA = { "8sssd": "floppy_8", # trs dragon32, etc - "qd": "floppy_5_25" + "qd": "floppy_5_25", + + # oric, amstrad, sinclair, etc, used a 3" disk. We'll round up. + "3dsdd": "floppy_3_5", + "3ssdd": "floppy_3_5", } diff --git a/python/mkmodels.py b/python/mkmodels.py index 231cbec..6476714 100644 --- a/python/mkmodels.py +++ b/python/mkmodels.py @@ -54,6 +54,10 @@ tandy_children = [ "dragon32", "dragon64", "d64plus", "dragon200", "dragon200e", "tanodr64", ] +oric_children = [ + "oric1", "orica", "prav8d", "telstrat", +] + amiga_children = ["a500", "a500n", "a1000", "a1000n", "a2000", "a2000n" ] @@ -90,7 +94,8 @@ TREE = [ ("Macintosh (Quadra)", None, mac_quadra_children), ("Macintosh (LC)", None, mac_lc_children), ("Atari ST", "st", atari_st_children), - ("Tandy", None, tandy_children) + ("Oric", None, oric_children), + ("Tandy", None, tandy_children), ] TREE_EXTRA = TREE + [