Apple-2-Tools
/
applepy
mirror of https://github.com/jtauber/applepy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

finish cassette support

This commit is contained in:
Greg Hewgill 2011-08-16 16:41:15 +12:00
parent 4963eeca9d
commit 6951db69ad
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
applepy.py
View File

@ -296,8 +296,8 @@ class Cassette:
self.raw = wav.readframes(wav.getnframes()) self.raw = wav.readframes(wav.getnframes())
def read_byte(self, cycle): def read_byte(self, cycle):
sys.stdout.write(str(cycle * 22000 / 1000000) + "\r") offset = cycle * 22000 / 1000000
return ord(self.raw[cycle * 22000 / 1000000]) return ord(self.raw[offset]) if offset < len(self.raw) else 0x80
class SoftSwitches: class SoftSwitches:
@ -334,7 +334,8 @@ class SoftSwitches:
elif address == 0xC057: elif address == 0xC057:
self.display.hires() self.display.hires()
elif address == 0xC060: elif address == 0xC060:
return self.cassette.read_byte(cycle) if self.cassette:
return self.cassette.read_byte(cycle)
else: else:
pass # print "%04X" % address pass # print "%04X" % address
return 0x00 return 0x00
@ -406,6 +407,7 @@ def usage():
print >>sys.stderr print >>sys.stderr
print >>sys.stderr, "Usage: applepy.py [options]" print >>sys.stderr, "Usage: applepy.py [options]"
print >>sys.stderr print >>sys.stderr
print >>sys.stderr, " -c, --cassette Cassette wav file to load"
print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)" print >>sys.stderr, " -R, --rom ROM file to use (default A2ROM.BIN)"
print >>sys.stderr, " -r, --ram RAM file to load (default none)" print >>sys.stderr, " -r, --ram RAM file to load (default none)"
print >>sys.stderr, " -q, --quiet Quiet mode, no sounds (default sounds)" print >>sys.stderr, " -q, --quiet Quiet mode, no sounds (default sounds)"
@ -415,6 +417,7 @@ def usage():
def get_options(): def get_options():
class Options: class Options:
def __init__(self): def __init__(self):
self.cassette = None
self.rom = "A2ROM.BIN" self.rom = "A2ROM.BIN"
self.ram = None self.ram = None
self.quiet = False self.quiet = False
@ -423,7 +426,10 @@ def get_options():
a = 1 a = 1
while a < len(sys.argv): while a < len(sys.argv):
if sys.argv[a].startswith("-"): if sys.argv[a].startswith("-"):
if sys.argv[a] in ("-R", "--rom"): if sys.argv[a] in ("-c", "--cassette"):
a += 1
options.cassette = sys.argv[a]
elif sys.argv[a] in ("-R", "--rom"):
a += 1 a += 1
options.rom = sys.argv[a] options.rom = sys.argv[a]
elif sys.argv[a] in ("-r", "--ram"): elif sys.argv[a] in ("-r", "--ram"):
@ -444,7 +450,7 @@ if __name__ == "__main__":
options = get_options() options = get_options()
display = Display() display = Display()
speaker = None if options.quiet else Speaker() speaker = None if options.quiet else Speaker()
cassette = Cassette("k7_apple_600202300_littlebrickout.wav") cassette = Cassette(options.cassette) if options.cassette else None
apple = Apple2(options, display, speaker, cassette) apple = Apple2(options, display, speaker, cassette)
apple.run() apple.run()