Squashed commit of the following:

commit e3249a2
Author: DylanSpeiser <[email protected]>
Date:   Tue Feb 27 16:18:32 2024 +1100

    Update README.md

commit 85717d3
Author: DylanSpeiser <[email protected]>
Date:   Tue Feb 27 12:33:05 2024 +1100

    v2.10 DRAFT

    Hey! Love your work on this. I'm ready to merge this into main but I can't seem to get Wozmon working with the serial window. Would you be able to show your process?

commit 1375dca
Author: ly <[email protected]>
Date:   Fri Feb 9 18:29:25 2024 -0500

    Create SerialInterface.java

commit 2aa0803
Author: ly <[email protected]>
Date:   Fri Feb 9 18:29:09 2024 -0500

    Update ACIA.java

    -serial interface

commit a850afc
Author: ly <[email protected]>
Date:   Fri Feb 9 18:28:55 2024 -0500

    Update CPU.java

    -serial interface

commit 38d65ab
Author: ly <[email protected]>
Date:   Fri Feb 9 18:28:30 2024 -0500

    Update VIA.java

    -fixed interupt functions

commit a56b472
Author: ly <[email protected]>
Date:   Fri Feb 9 18:27:55 2024 -0500

    Update DisplayPanel.java

    -serial interface
    -realistic keyboard

commit 712f21f
Author: ly <[email protected]>
Date:   Fri Feb 9 18:26:43 2024 -0500

    Update EaterEmulator.java

    -reset button
    -show serial button
    -serial interface
    -realistic keyboard option
    -windowWidth & windowHeight options

Author: DylanSpeiser

README.md

@@ -1,5 +1,22 @@
 # Java 6502 Emulator
 
+## Update: v2.10: Realistic Keyboard, Serial Emulation, and more command line args!
+What an update! Thanks to lythd, the emulator now supports a realistic PS/2-like keyboard mode that can be enabled in the options pane. They've also added a serial emulator that can be turned on in a separate window. It's super cool!
+
+Note that Wozmon is not running correctly through this serial interface yet, but we are working on the issue and will update when it's fixed.
+
+We've also added some new command line arguments:
+- `-windowWidth <int>` and `windowHeight <int>` do what they say on the tin, and should be a welcome change for those of you with differently sized monitors.
+- `-f <path to ROM file>` will pre-load the ROM with the file specified. I finally got around to adding this one, and I hope you find it useful.
+
+I'd also like to take this opportunity to note that this repo is showing its age. The code is an absolute mess since I wrote it back in high school, and I'd like to take some time to completely rewrite it from the ground up using actual OOP instead of the mess of magic numbers and duplicated function calls that builds the Swing UI.<br>
+It will be a big undertaking, but seeing how popular this repo is getting I'm sure everyone would appreciate it.
+
+(still) Coming soon!:
+- More bug fixes, Wozmon
+- Complete code refactor
+- Other 65C02 instructions
+
 ## Update: v2.9: ACIA and Command line options!
 Thanks to Steve Rubin, the emulator now supports ACIA communication through the command line! Like the VIA, the ACIA's address can be adjusted in the options menu.
 

src/ACIA.java

@@ -33,24 +33,9 @@ public byte read(short address) {
 
 		switch (Short.toUnsignedInt(address) - Bus.ACIA_ADDRESS) {
 			case 0x00:
-				try {
-						DATA = (byte) System.in.read();
-						if (DATA == 0xa) DATA = 0xd; //convert \n to \r
-					
-				} catch (Exception e) {
-					System.err.println("Error reading from System.in");
-				}
-				return DATA; // Read Receiver Data Register
+				return EaterEmulator.serial.getKey(); // get serial key
 			case 0x01:
-			try	 {
-								if (System.in.available() >= 1) {  // TODO: Remove this later when we go to a windowed interface
-					STATUS = 1 << 3;
-				} else {
-					STATUS = 0 << 3;
-				}
-			} catch (Exception e) {
-				System.err.println("Error reading from System.in");
-			}
+				STATUS = (byte) (EaterEmulator.serial.hasKey() ? 0x08 : 0x00);
 				return STATUS; // Read Status Register
 			case 0x02:
 				return COMMAND; // Read Command Register
@@ -67,12 +52,15 @@ public byte read(short address) {
 	public void write(short address, byte data) {
 		switch (Short.toUnsignedInt(address) - Bus.ACIA_ADDRESS) {
 			case 0x00:
-				System.out.printf("%c", data); // Write Transmitter Data Register
-				if (data == 0xd) System.out.printf("\n"); // convert \r to \n
+				if (data != 0xd) EaterEmulator.serial.receiveKey(data); // discard \r so its just \n, send to serial interface
 
 			case 0x01: // Programmed Reset
 							// Clear bits 4 through 0 in the Command Register and bit 2 in the Status
 							// Register
+				//COMMAND &= 0b11100000;
+				//STATUS &= 0b11111011; //i dont remember this but just doing what was written
+				//EaterEmulator.serial.reset();
+				//okay this is triggering in some random places and im kinda confused why so ill just leave it empty like how it was before
 			case 0x02:
 				COMMAND = data;
 				break; // Write Command Register
@@ -85,4 +73,4 @@ public void write(short address, byte data) {
 		}
 	}
 
-}
+}

src/Bus.java

@@ -8,6 +8,7 @@ public static byte read(short address) {
 		} else if (Short.toUnsignedInt(address) <= VIA_ADDRESS+16 && Short.toUnsignedInt(address) >= VIA_ADDRESS) {
 			return EaterEmulator.via.read(address);
 		} else if (Short.toUnsignedInt(address) <= ACIA_ADDRESS+3 && Short.toUnsignedInt(address) >= ACIA_ADDRESS) {
+			if (EaterEmulator.verbose) System.out.println("Read from address "+Integer.toHexString(Short.toUnsignedInt(address)));
 			return EaterEmulator.acia.read(address);
 		} else {
 			return EaterEmulator.ram.read(address);
@@ -21,9 +22,10 @@ public static void write(short address, byte data) {
 			EaterEmulator.via.write(address, data);
 		} else if (Short.toUnsignedInt(address) <= ACIA_ADDRESS+3 && Short.toUnsignedInt(address) >= ACIA_ADDRESS) {
 			EaterEmulator.acia.write(address, data);
+			if (EaterEmulator.verbose) System.out.println("Wrote "+ROMLoader.byteToHexString(data)+" at "+Integer.toHexString(Short.toUnsignedInt(address)));
 		} else {
 			EaterEmulator.ram.write(address, data);
 		}
-		//if (EaterEmulator.verbose) System.out.println("Wrote "+data+" at "+address);
+		
 	}
 }

src/CPU.java

@@ -624,6 +624,9 @@ void executeOpcodeFunction(String opcode) {
 
 	//Input Signal Handlers
 	void reset() {
+		EaterEmulator.clockState = false;
+		if (EaterEmulator.serial != null) EaterEmulator.serial.reset();
+		
 		a = 0;
 		x = 0;
 		y = 0;