ac6502 1.6.0 → 1.8.0

package/src/index.ts

@@ -12,7 +12,7 @@ import sdl from '@kmamal/sdl'
 import { readFile, writeFile } from 'fs/promises'
 import { existsSync } from 'fs'
 
-const VERSION = '1.6.0'
+const VERSION = '1.8.0'
 const WIDTH = 320
 const HEIGHT = 240
 
@@ -47,6 +47,7 @@ interface EmulatorOptions {
   port?: string
   storage?: string
   target?: string
+  encoder?: string
 }
 
 class Emulator {
@@ -72,6 +73,7 @@ class Emulator {
     await this.loadBinaries()
     this.configureFrequency()
     this.configureScale()
+    this.configureEncoder()
     await this.setupSerialPort()
     this.setupAudio()
     this.setupWindow()
@@ -116,12 +118,23 @@ class Emulator {
         ;(this.machine.io4 as Storage).loadData(new Uint8Array(storageData))
       } else {
         console.log(`Storage file not found: ${this.options.storage}`)
-        console.log('A new storage file will be created on exit.')
-        ;(this.machine.io4 as Storage).loadData(null)
+        console.log('Initializing new storage file...')
+        const emptyStorage = (this.machine.io4 as Storage).getData()
+        await writeFile(this.options.storage, emptyStorage)
+        console.log(`Storage file created: ${this.options.storage}`)
       }
     }
   }
 
+  private configureEncoder(): void {
+    const enc = this.options.encoder ?? 'matrix'
+    const activePort = enc === 'ps2' ? 'A' : enc === 'matrix' ? 'B' : 'both'
+    if (this.machine.keyboardEncoderAttachment) {
+      this.machine.keyboardEncoderAttachment.activePort = activePort as 'A' | 'B' | 'both'
+      console.log(`Keyboard encoder: ${enc} (Port ${activePort})`)
+    }
+  }
+
   private configureFrequency(): void {
     if (this.options.freq) {
       const frequency = Number(this.options.freq)
@@ -537,6 +550,9 @@ class Emulator {
   }
 
   private shutdown(): void {
+    // Stop the machine loop to prevent further rendering after window close
+    this.machine.stop()
+
     // Close all connected controllers
     for (const [id, controller] of this.controllers.entries()) {
       if (!controller.closed) {
@@ -598,17 +614,18 @@ program
   .description('Emulator for the A.C. Wright 6502 project.')
   .version(VERSION, '-v, --version', 'Output the current emulator version')
   .helpOption('-h, --help', 'Output help / options')
-  .option('-a, --parity <parity>', 'Parity (odd | even | none)', 'none')
-  .option('-b, --baudrate <baudrate>', 'Baud Rate', '9600')
-  .option('-c, --cart <path>', 'Path to 32K Cart binary file')
-  .option('-d, --databits <databits>', 'Data Bits (5 | 6 | 7 | 8)', '8')
-  .option('-f, --freq <freq>', 'Set the clock frequency in Hz', '1000000')
-  .option('-p, --port <port>', 'Path to the serial port (e.g., /dev/ttyUSB0)')
-  .option('-r, --rom <path>', 'Path to 32K ROM binary file')
-  .option('-s, --scale <scale>', 'Set the emulator scale', '2')
-  .option('-S, --storage <path>', 'Path to storage data file for Compact Flash card persistence')
-  .option('-t, --stopbits <stopbits>', 'Stop Bits (1 | 1.5 | 2)', '1')
+  .addOption(new Option('-a, --parity <parity>', 'Parity (odd | even | none)').default('none'))
+  .addOption(new Option('-b, --baudrate <baudrate>', 'Baud Rate').default('9600'))
+  .addOption(new Option('-c, --cart <path>', 'Path to 32K Cart binary file'))
+  .addOption(new Option('-d, --databits <databits>', 'Data Bits (5 | 6 | 7 | 8)').default('8'))
+  .addOption(new Option('-f, --freq <freq>', 'Set the clock frequency in Hz').default('1000000'))
+  .addOption(new Option('-p, --port <port>', 'Path to the serial port (e.g., /dev/ttyUSB0)'))
+  .addOption(new Option('-r, --rom <path>', 'Path to 32K ROM binary file'))
+  .addOption(new Option('-s, --scale <scale>', 'Set the emulator scale').default('2'))
+  .addOption(new Option('-S, --storage <path>', 'Path to storage data file for Compact Flash card persistence'))
+  .addOption(new Option('-t, --stopbits <stopbits>', 'Stop Bits (1 | 1.5 | 2)').default('1'))
   .addOption(new Option('-T, --target <target>', 'System target').choices(['cob', 'vcs', 'kim', 'dev']).default('cob'))
+  .addOption(new Option('-e, --encoder <mode>', 'Keyboard encoder active port (ps2 = Port A / CA1, matrix = Port B / CB1)').choices(['ps2', 'matrix', 'both']).default('matrix'))
   .addHelpText('beforeAll', figlet.textSync('6502 Emulator', { font: 'cricket' }) + '\n' + `Version: ${VERSION} | A.C. Wright Design\n`)
   .parse(process.argv)
 

package/src/tests/IO/RTC.test.ts

@@ -2,11 +2,6 @@ import { RTC } from '../../components/IO/RTC'
 
 const bcdToDecimal = (bcd: number): number => (((bcd >> 4) & 0x0f) * 10) + (bcd & 0x0f)
 
-const enableTransfers = (rtc: RTC): void => {
-	rtc.write(0x0f, 0x80)
-	rtc.tick(1)
-}
-
 const setTime = (rtc: RTC, values: {
 	seconds: number
 	minutes: number
@@ -17,15 +12,16 @@ const setTime = (rtc: RTC, values: {
 	year: number
 	century: number
 }): void => {
-	enableTransfers(rtc)
+	rtc.write(0x0f, 0x80) // Set TE to inhibit transfers
 	rtc.write(0x00, values.seconds)
 	rtc.write(0x01, values.minutes)
 	rtc.write(0x02, values.hours)
 	rtc.write(0x03, values.dayOfWeek)
 	rtc.write(0x04, values.date)
-	rtc.write(0x05, values.month | 0x80)
+	rtc.write(0x05, values.month) // EOSC=0: oscillator enabled (DS1511Y default)
 	rtc.write(0x06, values.year)
 	rtc.write(0x07, values.century)
+	rtc.write(0x0f, 0x00) // Clear TE: falling edge commits user to internal
 }
 
 describe('RTC', () => {
@@ -64,7 +60,7 @@ describe('RTC', () => {
 			expect(bcdToDecimal(century)).toBeGreaterThanOrEqual(0)
 			expect(bcdToDecimal(century)).toBeLessThanOrEqual(39)
 
-			expect(month & 0x80).toBe(0x80)
+			expect(month & 0x80).toBe(0x00)
 		})
 	})
 
@@ -150,7 +146,7 @@ describe('RTC', () => {
 				century: 0x20
 			})
 
-			rtc.write(0x05, 0x01)
+			rtc.write(0x05, 0x81) // EOSC=1: oscillator disabled
 			rtc.tick(1)
 
 			expect(rtc.read(0x00)).toBe(0x10)

package/src/tests/IO/Video.test.ts

@@ -78,7 +78,7 @@ const setupTextMode = (vdp: Video): void => {
  * Must not overshoot into the next frame (scanline 0 of the next
  * frame clears the status register during sprite processing).
  */
-const renderOneFrame = (vdp: Video, frequency: number = 2000000): void => {
+const renderOneFrame = (vdp: Video, frequency: number = 1000000): void => {
   // At 2MHz: cyclesPerFrame ≈ 33333, each tick = 128 cycles → ~261 ticks/frame
   const ticksPerFrame = Math.ceil((frequency / 60) / 128)
   for (let i = 0; i < ticksPerFrame; i++) {

package/src/tests/Machine.test.ts

@@ -24,7 +24,7 @@ describe('Machine', () => {
 
     test('Machine initializes with correct default properties', () => {
       expect(machine.isRunning).toBe(false)
-      expect(machine.frequency).toBe(2000000)
+      expect(machine.frequency).toBe(1000000)
       expect(machine.scale).toBe(2)
       expect(machine.frames).toBe(0)
     })