From a65596d4c514c321e7872b1568d100aa0786662a Mon Sep 17 00:00:00 2001
From: Jorj Bauer <jorj@jorj.org>
Date: Tue, 19 Jan 2021 22:28:35 -0500
Subject: [PATCH] startup order fixes; move key-down-map to extmem

---
 teensy/teensy.ino | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/teensy/teensy.ino b/teensy/teensy.ino
index 9cc673a..ede0d21 100644
--- a/teensy/teensy.ino
+++ b/teensy/teensy.ino
@@ -125,7 +125,7 @@ static uint8_t usb_scanmap[256] = {
   0, 0, 0, 0, 0, 0 // 250-255
 };
 	
-uint8_t keysPressed[256]; // FIXME: if we need to save RAM, make this bitflags
+EXTMEM uint8_t keysPressed[256]; // FIXME: if we need to save RAM, make this bitflags
 
 void onKeypress(uint8_t keycode)
 {
@@ -163,6 +163,7 @@ void setup()
   while (!Serial) {
     yield();
   }
+  delay(2000);
 #endif
   delay(200); // let the power settle & serial to get its bearings
 
@@ -212,11 +213,6 @@ void setup()
   println(" cpu");
   g_cpu = new Cpu();
 
-  println(" usb");
-  usb.init();
-  usb.attachKeypress(onKeypress);
-  usb.attachKeyrelease(onKeyrelease);
-
   // Create the virtual machine. This may read from g_filemanager to
   // get ROMs if necessary.  (The actual Apple VM we've built has them
   // compiled in, though.) It will create its virutal hardware (MMU,
@@ -230,13 +226,23 @@ void setup()
   println("  [setMMU]");
   g_cpu->SetMMU(g_vm->getMMU());
 
+  // the paddles are used by the teensy mouse
+  println(" paddles");
+  g_paddles = new TeensyPaddles(A3, A2, g_invertPaddleX, g_invertPaddleY);
+
+  // The keyboard reaches in to the mouse
+  println(" mouse");
+  g_mouse = new TeensyMouse();
+  
   // And the physical keyboard needs hooks in to the virtual keyboard...
   println(" keyboard");
   g_keyboard = new TeensyKeyboard(g_vm->getKeyboard());
-  g_mouse = new TeensyMouse();
 
-  println(" paddles");
-  g_paddles = new TeensyPaddles(A3, A2, g_invertPaddleX, g_invertPaddleY);
+  // the usb keyboard piggybacks on g_keyboard
+  println(" usb");
+  usb.init();
+  usb.attachKeypress(onKeypress);
+  usb.attachKeyrelease(onKeyrelease);
 
   // Now that all the virtual hardware is glued together, reset the VM
   println("Resetting VM");
@@ -246,11 +252,6 @@ void setup()
   readPrefs(); // read from eeprom and set anything we need setting
   g_speaker->begin(); // let the speaker reset its volume from g_volume
   
-  // Debugging: insert a disk on startup...
-  //((AppleVM *)g_vm)->insertDisk(0, "/A2DISKS/UTIL/mock2dem.dsk", false);
-  //((AppleVM *)g_vm)->insertDisk(0, "/A2DISKS/JORJ/disk_s6d1.dsk", false);
-  //  ((AppleVM *)g_vm)->insertDisk(0, "/A2DISKS/GAMES/ALIBABA.DSK", false);
-
   resetButtonDebouncer.attach(RESETPIN);
   resetButtonDebouncer.interval(5); // ms