jsbeeb 1.7.0 → 1.8.0

package/package.json

@@ -7,7 +7,7 @@
   "name": "jsbeeb",
   "description": "Emulate a BBC Micro",
   "repository": "git@github.com:mattgodbolt/jsbeeb.git",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "//": "If you change the version of Node, it must also be updated at the top of the Dockerfile.",
   "engines": {
     "node": "22"

package/tests/test-machine.js

@@ -102,6 +102,22 @@ export class TestMachine {
         this.processor.fdc.loadDisc(0, fdc.discFor(this.processor.fdc, "", data));
     }
 
+    /**
+     * Load a disc image from raw data (Uint8Array or Buffer).
+     * @param {Uint8Array|Buffer} data - raw disc image bytes
+     */
+    loadDiscData(data) {
+        this.processor.fdc.loadDisc(0, fdc.discFor(this.processor.fdc, "", data));
+    }
+
+    /**
+     * Reset the machine.
+     * @param {boolean} hard - true for power-on reset, false for soft reset
+     */
+    reset(hard) {
+        this.processor.reset(hard);
+    }
+
     async loadBasic(source) {
         const tokeniser = await Tokeniser.create();
         const tokenised = tokeniser.tokenise(source);
@@ -186,8 +202,19 @@ export class TestMachine {
                 return { code: utils.keyCodes.K4, shift: true };
             case "%":
                 return { code: utils.keyCodes.K5, shift: true };
-            default:
-                return { code: ch.toUpperCase().charCodeAt(0), shift: false };
+            default: {
+                const upper = ch.toUpperCase();
+                const isLetter = (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z");
+                if (isLetter) {
+                    const wantUpper = ch >= "A" && ch <= "Z";
+                    const capsOn = this.processor.sysvia.capsLockLight;
+                    // CAPS LOCK on: unshifted = upper, shifted = lower
+                    // CAPS LOCK off: unshifted = lower, shifted = upper
+                    const needShift = capsOn ? !wantUpper : wantUpper;
+                    return { code: upper.charCodeAt(0), shift: needShift };
+                }
+                return { code: ch.charCodeAt(0), shift: false };
+            }
         }
     }
 
@@ -201,7 +228,7 @@ export class TestMachine {
     async type(text) {
         const fullText = text + "\n"; // append RETURN
         const keys = fullText.split("").map((ch) => this._charToKey(ch));
-        const holdCycles = 40000; // cycles between key events, matching old type() timing
+        const holdCycles = 40000;
         let index = 0;
         let phase = "idle"; // "idle" → "down" → "idle"
         let nextEventCycle = 0;
@@ -246,6 +273,34 @@ export class TestMachine {
         }
     }
 
+    /**
+     * Press a key on the BBC keyboard.
+     * @param {number} code - BBC key code (e.g. utils.keyCodes.SPACE)
+     */
+    keyDown(code) {
+        this.processor.sysvia.keyDown(code);
+    }
+
+    /**
+     * Release a key on the BBC keyboard.
+     * @param {number} code - BBC key code
+     */
+    keyUp(code) {
+        this.processor.sysvia.keyUp(code);
+    }
+
+    /**
+     * Load a ROM image directly into a sideways RAM slot.
+     * @param {number} slot - slot number (0-15, typically 4-7 for SWRAM)
+     * @param {Uint8Array|Buffer} data - ROM data (up to 16384 bytes)
+     */
+    loadSidewaysRam(slot, data) {
+        const offset = this.processor.romOffset + slot * 16384;
+        for (let i = 0; i < data.length && i < 16384; i++) {
+            this.processor.ramRomOs[offset + i] = data[i];
+        }
+    }
+
     writebyte(addr, val) {
         this.processor.writemem(addr, val);
     }