diff --git a/Makefile b/Makefile index 47972f0a..9c53964f 100644 --- a/Makefile +++ b/Makefile @@ -54,4 +54,4 @@ syncprod: distro cp config.js $(TMP) #aws --profile pzp s3 sync --follow-symlinks $(TMP)/ s3://8bitworkshop.com/v$(VERSION)/ s3cmd -c ~/.s3pzp sync -MFP --no-mime-magic $(TMP)/ config.js s3://8bitworkshop.com/v$(VERSION)/ - rsync --stats -riltz --chmod=a+rx -e "ssh" $(TMP)/ config.js $(RSYNC_PATH)/v$(VERSION)/ + rsync --stats --del -riltz --chmod=a+rx -e "ssh" $(TMP)/ config.js $(RSYNC_PATH)/v$(VERSION)/ diff --git a/src/machine/atari7800.ts b/src/machine/atari7800.ts index 6bb6be94..04f5a14c 100644 --- a/src/machine/atari7800.ts +++ b/src/machine/atari7800.ts @@ -464,7 +464,7 @@ export class Atari7800 extends BasicMachine implements RasterFrameBased { } getRasterX() { return this.lastFrameCycles % colorClocksPerLine; } - getRasterY() { return Math.floor(this.lastFrameCycles / colorClocksPerLine); } + getRasterY() { return this.scanline; } loadROM(data) { if (data.length == 0xc080) data = data.slice(0x80); // strip header diff --git a/test/web/testallpresets.js b/test/web/testallpresets.js index e1ee5f5d..6846887f 100644 --- a/test/web/testallpresets.js +++ b/test/web/testallpresets.js @@ -90,6 +90,7 @@ function testPlatform(exports, platform_id, platform_name, numPresets) { var ex = module.exports; ex['@tags'] = [] + testPlatform(ex, 'vcs', 'Atari 2600', 35); testPlatform(ex, 'nes', 'NES', 30); testPlatform(ex, 'vicdual', 'VIC Dual', 7); @@ -107,7 +108,7 @@ testPlatform(ex, 'verilog', 'Verilog', 33); testPlatform(ex, 'apple2', 'Apple ][+', 10); testPlatform(ex, 'basic', 'BASIC', 10); testPlatform(ex, 'zmachine', 'Z-Machine', 19); -//testPlatform(ex, 'atari8-800xl.mame', 'Atari 800XL', 9); testPlatform(ex, 'msx', 'MSX', 5); -testPlatform(ex, 'zx', 'ZX', 3); +//testPlatform(ex, 'zx', 'ZX', 3); testPlatform(ex, 'c64', 'Commodore 64', 15); +testPlatform(ex, 'atari8-800', 'Atari 800', 9);