ac6502 1.4.1 → 1.5.1

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.4.1'
+const VERSION = '1.5.1'
 const WIDTH = 320
 const HEIGHT = 240
 
@@ -72,10 +72,11 @@ class Emulator {
     await this.loadBinaries()
     this.configureFrequency()
     this.configureScale()
-    this.setupSerialPort()
+    await this.setupSerialPort()
     this.setupAudio()
     this.setupWindow()
     this.setupControllers()
+    this.machine.reset(true)
   }
 
   private validateOptions(): void {
@@ -155,7 +156,7 @@ class Emulator {
     }
   }
 
-  private setupSerialPort(): void {
+  private async setupSerialPort(): Promise<void> {
     if (!this.options.port) {
       return
     }
@@ -170,11 +171,8 @@ class Emulator {
       baudRate: baudRate,
       parity: parity,
       dataBits: dataBits,
-      stopBits: stopBits
-    }, (err) => {
-      if (err) {
-        console.log('Error: ', err.message)
-      }
+      stopBits: stopBits,
+      autoOpen: false
     })
 
     this.serialPort.on('data', (data: Buffer<ArrayBuffer>) => {
@@ -192,10 +190,22 @@ class Emulator {
         })
       }
     }
+
+    await new Promise<void>((resolve, reject) => {
+      this.serialPort!.open((err) => {
+        if (err) {
+          console.log('Error opening serial port: ', err.message)
+          reject(err)
+        } else {
+          console.log(`Serial port opened: ${this.options.port}`)
+          resolve()
+        }
+      })
+    })
   }
 
   private setupAudio(): void {
-    if (this.options.target === 'kim' || this.options.target === 'dev') return
+    if (this.options.target === 'kim') return
     try {
       this.audioDevice = sdl.audio.openDevice({ type: 'playback' }, {
         channels: AUDIO_CHANNELS as 1,
@@ -204,8 +214,10 @@ class Emulator {
         buffered: AUDIO_BUFFERED,
       })
 
-      // Configure Sound sample rate to match audio device
-      ;(this.machine.io7 as Sound).sampleRate = this.audioDevice.frequency
+      // Configure Sound sample rate to match audio device (not needed for dev target)
+      if (this.options.target !== 'dev') {
+        ;(this.machine.io7 as Sound).sampleRate = this.audioDevice.frequency
+      }
 
       // Connect the Machine's audio callback to the SDL audio device
       this.machine.play = (samples: Float32Array) => {
@@ -347,12 +359,32 @@ class Emulator {
         for (let i = 0; i < WIDTH * HEIGHT; i++) {
           const v = src[i]
           const off = i * 4
-          rgbaBuffer[off]     = v
-          rgbaBuffer[off + 1] = v
-          rgbaBuffer[off + 2] = v
+          const r3 = (v >> 5) & 0x07
+          const g3 = (v >> 2) & 0x07
+          const b2 = v & 0x03
+          rgbaBuffer[off]     = (r3 << 5) | (r3 << 2) | (r3 >> 1)
+          rgbaBuffer[off + 1] = (g3 << 5) | (g3 << 2) | (g3 >> 1)
+          rgbaBuffer[off + 2] = (b2 << 6) | (b2 << 4) | (b2 << 2) | b2
           rgbaBuffer[off + 3] = 0xFF
         }
         this.window.render(WIDTH, HEIGHT, WIDTH * 4, 'rgba32', rgbaBuffer)
+
+        // Synthesize and play any queued VTAC bell tones
+        if (this.machine.play && this.audioDevice) {
+          const sampleRate = this.audioDevice.frequency
+          while (devBoard.vtac.hasQueuedBells()) {
+            const bell = devBoard.vtac.getNextBell()
+            if (bell) {
+              const numSamples = Math.floor((bell.duration / 60) * sampleRate)
+              const samples = new Float32Array(numSamples)
+              const twoPiF = 2 * Math.PI * bell.frequency
+              for (let i = 0; i < numSamples; i++) {
+                samples[i] = Math.sin(twoPiF * i / sampleRate)
+              }
+              this.machine.play(samples)
+            }
+          }
+        }
       }
     }
 

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

@@ -137,18 +137,18 @@ describe('ACIA (6551 ACIA)', () => {
         expect(mockIRQ).toHaveBeenCalled()
       })
 
-      it('should disable receive IRQ when bit 2 is clear', () => {
+      it('should disable receive IRQ when RIIE bit (bit 1) is set', () => {
         const mockIRQ = jest.fn()
         serialCard.raiseIRQ = mockIRQ
 
-        serialCard.write(0x02, 0x00) // Disable receive IRQ
+        serialCard.write(0x02, 0x02) // RIIE=1: receive IRQ disabled (W65C51N: bit1=1 disables)
         serialCard.onData(0x42)
 
         expect(mockIRQ).not.toHaveBeenCalled()
       })
 
-      it('should enable echo mode when bit 5 is set', () => {
-        serialCard.write(0x02, 0x20) // Enable echo mode
+      it('should enable echo mode when REM bit (bit 4) is set', () => {
+        serialCard.write(0x02, 0x10) // REM=1: echo mode enabled (bit 4 per 6551 spec)
         serialCard.onData(0x42)
         
         // In echo mode, received data is added to transmit buffer
@@ -276,7 +276,7 @@ describe('ACIA (6551 ACIA)', () => {
       serialCard.transmit = mockTransmit
 
       serialCard.write(0x03, 0x00) // Set control register
-      serialCard.write(0x02, 0x08) // Enable transmit IRQ
+      serialCard.write(0x02, 0x04) // TIC=01: transmit IRQ enabled with /RTS low (bits 3-2 = 01)
       serialCard.write(0x00, 0x42)
 
       for (let i = 0; i < 100; i++) {
@@ -291,7 +291,7 @@ describe('ACIA (6551 ACIA)', () => {
       const mockIRQ = jest.fn()
       serialCard.raiseIRQ = mockIRQ
 
-      serialCard.write(0x02, 0x00) // Disable receive IRQ
+      serialCard.write(0x02, 0x02) // RIIE=1: receive IRQ disabled (W65C51N: bit1=1 disables)
       serialCard.onData(0x42)
 
       expect(mockIRQ).not.toHaveBeenCalled()
@@ -343,7 +343,7 @@ describe('ACIA (6551 ACIA)', () => {
       const mockTransmit = jest.fn()
       serialCard.transmit = mockTransmit
 
-      serialCard.write(0x02, 0x20) // Enable echo mode
+      serialCard.write(0x02, 0x10) // REM=1: echo mode enabled (bit 4 per 6551 spec)
       serialCard.onData(0x42)
 
       // Tick to allow transmission
@@ -369,7 +369,7 @@ describe('ACIA (6551 ACIA)', () => {
     })
 
     it('should clear TDRE flag in echo mode', () => {
-      serialCard.write(0x02, 0x20) // Enable echo mode
+      serialCard.write(0x02, 0x10) // REM=1: echo mode enabled (bit 4 per 6551 spec)
       serialCard.onData(0x42)
 
       const status = serialCard.read(0x01)