Apple-2-Tools/apple2js
1
0
Fork 0
mirror of https://github.com/whscullin/apple2js.git synced 2024-01-12 14:14:38 +00:00
Code Issues Projects Releases Wiki Activity

Typescript mains (#77)

Browse Source
This commit is contained in:
Will Scullin 2021-04-24 15:55:21 -07:00 committed by GitHub
parent 6af6ddd4a4
commit 8061caaaff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/main2.js → js/main2.ts
View File

@ -23,11 +23,11 @@ import OriginalROM from './roms/original';
import { Apple2 } from './apple2'; import { Apple2 } from './apple2';
var prefs = new Prefs(); const prefs = new Prefs();
var romVersion = prefs.readPref('computer_type2'); const romVersion = prefs.readPref('computer_type2');
var rom; let rom;
var characterRom = apple2_charset; let characterRom = apple2_charset;
var sectors = 16; let sectors = 16;
switch (romVersion) { switch (romVersion) {
case 'apple2': case 'apple2':
@ -56,33 +56,29 @@ switch (romVersion) {
rom = new Apple2ROM(); rom = new Apple2ROM();
} }
var options = { const options = {
canvas: document.getElementById('screen'), canvas: document.querySelector<HTMLCanvasElement>('#screen')!,
gl: prefs.readPref('gl_canvas', 'true') === 'true', gl: prefs.readPref('gl_canvas', 'true') === 'true',
screen: [], rom,
rom: rom, characterRom,
characterRom: characterRom,
e: false, e: false,
enhanced: false, enhanced: false,
cards: [],
tick: updateUI tick: updateUI
}; };
export var apple2 = new Apple2(options); export const apple2 = new Apple2(options);
var cpu = apple2.getCPU(); const cpu = apple2.getCPU();
var io = apple2.getIO(); const io = apple2.getIO();
var printer = new Printer('#printer-modal .paper'); const printer = new Printer('#printer-modal .paper');
var lc = new LanguageCard(rom); const lc = new LanguageCard(rom);
var parallel = new Parallel(printer); const parallel = new Parallel(printer);
var videoTerm = new VideoTerm(); const videoTerm = new VideoTerm();
var slinky = new RAMFactor(1024 * 1024); const slinky = new RAMFactor(1024 * 1024);
var disk2 = new DiskII(io, driveLights, sectors); const disk2 = new DiskII(io, driveLights, sectors);
var clock = new Thunderclock(); const clock = new Thunderclock();
var smartport = new SmartPort(cpu, { block: true }); const smartport = new SmartPort(cpu, { block: true });
initUI(apple2, disk2, smartport, printer, false);
io.setSlot(0, lc); io.setSlot(0, lc);
io.setSlot(1, parallel); io.setSlot(1, parallel);
@ -93,3 +89,5 @@ io.setSlot(6, disk2);
io.setSlot(7, smartport); io.setSlot(7, smartport);
cpu.addPageHandler(lc); cpu.addPageHandler(lc);
initUI(apple2, disk2, smartport, printer, false);

43
js/main2e.js → js/main2e.ts
View File

@ -18,11 +18,11 @@ import Apple2eEnhancedROM from './roms/apple2enh';
import { Apple2 } from './apple2'; import { Apple2 } from './apple2';
var prefs = new Prefs(); const prefs = new Prefs();
var romVersion = prefs.readPref('computer_type2e'); const romVersion = prefs.readPref('computer_type2e');
var enhanced = false; let enhanced = false;
var rom; let rom;
var characterRom = apple2e_charset; let characterRom = apple2e_charset;
switch (romVersion) { switch (romVersion) {
case 'apple2e': case 'apple2e':
@ -39,30 +39,27 @@ switch (romVersion) {
enhanced = true; enhanced = true;
} }
var options = { const options = {
gl: prefs.readPref('gl_canvas', 'true') === 'true', gl: prefs.readPref('gl_canvas', 'true') === 'true',
canvas: document.getElementById('screen'), canvas: document.querySelector<HTMLCanvasElement>('#screen')!,
rom: rom, rom,
characterRom: characterRom, characterRom,
e: true, e: true,
enhanced: enhanced, enhanced,
cards: [],
tick: updateUI tick: updateUI
}; };
export var apple2 = new Apple2(options); export const apple2 = new Apple2(options);
var io = apple2.getIO(); const io = apple2.getIO();
var cpu = apple2.getCPU(); const cpu = apple2.getCPU();
var printer = new Printer('#printer-modal .paper'); const printer = new Printer('#printer-modal .paper');
var parallel = new Parallel(printer); const parallel = new Parallel(printer);
var slinky = new RAMFactor(1024 * 1024); const slinky = new RAMFactor(1024 * 1024);
var disk2 = new DiskII(io, driveLights); const disk2 = new DiskII(io, driveLights);
var clock = new Thunderclock(); const clock = new Thunderclock();
var smartport = new SmartPort(cpu, { block: !enhanced }); const smartport = new SmartPort(cpu, { block: !enhanced });
initUI(apple2, disk2, smartport, printer, options.e);
io.setSlot(1, parallel); io.setSlot(1, parallel);
io.setSlot(2, slinky); io.setSlot(2, slinky);
@ -70,4 +67,4 @@ io.setSlot(5, clock);
io.setSlot(6, disk2); io.setSlot(6, disk2);
io.setSlot(7, smartport); io.setSlot(7, smartport);
initUI(apple2, disk2, smartport, printer, options.e);