Keyboards (#6)

* ...

* bugfix

* ...

* refactor

Author: jscrane

Makefile

@@ -1,7 +1,7 @@
 t ?= esp32
 
 CPPFLAGS = -DNO_STORAGE -DNO_SPIRAM
-LIBRARIES = SPI
+LIBRARIES = SPI PS2KeyRaw
 TERMINAL_SPEED := 115200
 
 ifeq ($t, tivac)

README.md

@@ -10,6 +10,8 @@ was a useful reference, as was Chris Lomont's [Pac Man emulation
 guide](http://www.lomont.org/Software/Games/PacMan/PacmanEmulation.pdf).
 (Reproduced [here](docs/PacmanEmulation.pdf).)
 
+There is a commented disassembly [here](http://cubeman.org/arcade-source/pacman.asm).
+
 There are still several bugs, see issue #1.
 
 Keyboard

config.h

@@ -5,10 +5,10 @@
 #define P2_START	0x1e	// 2
 #define COIN		0x26	// 3
 
-#define KEY_LEFT	PS2_KP_4
-#define KEY_RIGHT	PS2_KP_6
-#define KEY_UP		PS2_KP_8
-#define KEY_DOWN	PS2_KP_2
+#define KEY_LEFT	0x6b	// keypad #4
+#define KEY_RIGHT	0x74	// keypad #6
+#define KEY_UP		0x75	// keypad #8
+#define KEY_DOWN	0x72	// keypad #2
 
 #define PAUSE		0x29	// space
 #define ROTATE		0x2d	// r

io.cpp

@@ -54,6 +54,9 @@ void IO::up(uint8_t key) {
 	case COIN:
 		_coin = true;
 		break;
+	case PAUSE:
+		_paused = !_paused;
+		break;
 	case ROTATE:
 		_screen_flipped = !_screen_flipped;
 		break;

io.h

@@ -41,7 +41,7 @@
 #define ALTERNATE_NAMES		0b00000000
 #define NORMAL_NAMES		0b10000000
 
-class IO: public Memory::Device {
+class IO: public Memory::Device, public matrix_keyboard {
 public:
 	IO(Screen &screen): Memory::Device(256), _screen(screen) {
 		_up = _down = _left = _right = true;
@@ -57,12 +57,13 @@ class IO: public Memory::Device {
 	bool int_enabled() { return _int_enabled; }
 	bool sound_enabled() { return _sound_enabled; }
 	bool screen_flipped() { return _screen_flipped; }
+	bool paused() { return _paused; }
 
 private:
 	uint8_t _sx;
 
 	bool _up, _down, _left, _right, _coin, _p1_start, _p2_start;
-	bool _int_enabled, _sound_enabled, _screen_flipped;
+	bool _int_enabled, _sound_enabled, _screen_flipped, _paused;
 
 	Screen &_screen;
 };

pacman.ino

@@ -38,15 +38,27 @@ prom f6(rom6f, sizeof(rom6f));
 prom h6(rom6h, sizeof(rom6h));
 prom j6(rom6j, sizeof(rom6j));
 
-static bool paused;
 Screen screen(memory);
 IO io(screen);
+ps2_raw_kbd kbd(io);
 
 void reset(void) {
 	hardware_reset();
+	kbd.reset();
 	screen.begin();
 }
 
+void function_keys(uint8_t key) {
+	switch (key) {
+	case 1:
+		reset();
+		break;
+	case 10:
+		hardware_debug_cpu();
+		break;
+	}
+}
+
 void setup(void) {
 	hardware_init(cpu);
 
@@ -60,48 +72,19 @@ void setup(void) {
 	memory.put(pages[1], 0x4c00);
 	memory.put(io, 0x5000);
 
-#if defined(DEBUGGING)
-	Serial.begin(115200);
-#endif
-
 	reset();
 }
 
 void loop(void) {
-	static bool debug;
-
-	if (ps2.available()) {
-		unsigned scan = ps2.read2();
-		uint8_t key = scan & 0xff;
-		if (is_down(scan))
-			io.down(key);
-		else
-			switch (key) {
-			case PS2_F1:
-				reset();
-				break;
-			case PAUSE:
-				paused = !paused;
-				break;
-			case PS2_F8:
-				debug = !debug;
-				break;
-			default:
-				io.up(key);
-				break;
-			}
-	} else if (!paused) {
-		cpu.run(1000);
+
+	kbd.poll();
+
+	if (!io.paused()) {
+		hardware_run();
 		if (cpu.ts() > 51200) {
 			cpu.reset_ts();
 			if (io.int_enabled())
 				cpu.raise(irq);
 		}
-#if defined(DEBUGGING)
-		if (debug) {
-			char buf[160];
-			Serial.println(cpu.status(buf, sizeof(buf)));
-		}
-#endif
 	}
 }