Fix camel case of updateKey and wires up boot button

firmware/src/Emulator/keyboard_defs.h

@@ -53,6 +53,8 @@ enum SpecKeys
   // special pseudo keys
   SPECKEY_DEL,
   SPECKEY_BREAK,
+  // special keys for the emulator
+  SPECKEY_MENU,
 };
 
 const std::unordered_map<SpecKeys, char> specKeyToLetter = {

firmware/src/Emulator/spectrum.cpp

@@ -116,7 +116,7 @@ void ZXSpectrum::interrupt()
   Z80Interrupt(z80Regs, 0x38);
 }
 
-void ZXSpectrum::updatekey(SpecKeys key, uint8_t state)
+void ZXSpectrum::updateKey(SpecKeys key, uint8_t state)
 {
   // Bit pattern: XXXFULDR
   switch (key)

firmware/src/Emulator/spectrum.h

@@ -161,7 +161,7 @@ class ZXSpectrum
   }
 
   void interrupt();
-  void updatekey(SpecKeys key, uint8_t state);
+  void updateKey(SpecKeys key, uint8_t state);
 
   inline uint8_t z80_peek(uint16_t address)
   {

firmware/src/Screens/EmulatorScreen.cpp

@@ -59,7 +59,6 @@ EmulatorScreen::EmulatorScreen(TFTDisplay &tft, AudioOutput *audioOutput, IFiles
     Serial.println("ROM loading routine hit");
     triggerLoadTape(); });
   gameLoader = new GameLoader(machine, renderer, audioOutput);
-  pinMode(0, INPUT_PULLUP);
 }
 
 void EmulatorScreen::run(std::string filename, models_enum model)
@@ -102,7 +101,7 @@ void EmulatorScreen::resume()
   machine->resume();
 }
 
-void EmulatorScreen::updatekey(SpecKeys key, uint8_t state)
+void EmulatorScreen::updateKey(SpecKeys key, uint8_t state)
 {
   // TODO audio capture
   // if (key == SPECKEY_0)
@@ -116,7 +115,7 @@ void EmulatorScreen::updatekey(SpecKeys key, uint8_t state)
   //     Serial.printf("Audio file closed\n");
   //   }
   // }
-  machine->updatekey(key, state);
+  machine->updateKey(key, state);
 }
 
 void EmulatorScreen::showSaveSnapshotScreen()

firmware/src/Screens/EmulatorScreen.h

@@ -23,7 +23,7 @@ class EmulatorScreen : public Screen
     bool isLoading = false;
   public:
     EmulatorScreen(TFTDisplay &tft, AudioOutput *audioOutput, IFiles *files);
-    void updatekey(SpecKeys key, uint8_t state);
+    void updateKey(SpecKeys key, uint8_t state);
     void run(std::string filename, models_enum model);
     void pause();
     void resume();

firmware/src/Screens/EmulatorScreen/Machine.cpp

@@ -51,9 +51,9 @@ Machine::Machine(Renderer *renderer, AudioOutput *audioOutput, std::function<voi
   timeTravel = new TimeTravel();
 }
 
-void Machine::updatekey(SpecKeys key, uint8_t state) {
+void Machine::updateKey(SpecKeys key, uint8_t state) {
   if (isRunning) {
-    machine->updatekey(key, state);
+    machine->updateKey(key, state);
   }
 }
 
@@ -73,12 +73,12 @@ void Machine::start(FILE *audioFile) {
 
 void Machine::tapKey(SpecKeys key)
 {
-  machine->updatekey(key, 1);
+  machine->updateKey(key, 1);
   for (int i = 0; i < 10; i++)
   {
     machine->runForFrame(nullptr, nullptr);
   }
-  machine->updatekey(key, 0);
+  machine->updateKey(key, 0);
   for (int i = 0; i < 10; i++)
   {
     machine->runForFrame(nullptr, nullptr);
@@ -97,10 +97,10 @@ void Machine::startLoading()
   if (machine->hwopt.hw_model == SPECMDL_48K)
   {
     tapKey(SPECKEY_J);
-    machine->updatekey(SPECKEY_SYMB, 1);
+    machine->updateKey(SPECKEY_SYMB, 1);
     tapKey(SPECKEY_P);
     tapKey(SPECKEY_P);
-    machine->updatekey(SPECKEY_SYMB, 0);
+    machine->updateKey(SPECKEY_SYMB, 0);
     tapKey(SPECKEY_ENTER);
   }
   else

firmware/src/Screens/EmulatorScreen/Machine.h

@@ -155,7 +155,7 @@ class Machine {
     std::function<void()> romLoadingRoutineHitCallback;
   public:
     Machine(Renderer *renderer, AudioOutput *audioOutput, std::function<void()> romLoadingRoutineHitCallback);
-    void updatekey(SpecKeys key, uint8_t state);
+    void updateKey(SpecKeys key, uint8_t state);
     void setup(models_enum model);
     void start(FILE *audioFile);
     void pause() {

firmware/src/Screens/ErrorScreen.h

@@ -25,7 +25,7 @@ class ErrorScreen : public Screen
     updateDisplay();
   }
 
-  void updatekey(SpecKeys key, uint8_t state)
+  void updateKey(SpecKeys key, uint8_t state)
   {
     if (state == 1)
     {

firmware/src/Screens/NavigationStack.h

@@ -40,10 +40,10 @@ class NavigationStack
         }
       }
     }
-    void updatekey(SpecKeys key, uint8_t state) {
+    void updateKey(SpecKeys key, uint8_t state) {
       Screen *top = getTop();
       if (top) {
-        top->updatekey(key, state);
+        top->updateKey(key, state);
       }
     };
     void pressKey(SpecKeys key) {

firmware/src/Screens/Screen.h

@@ -23,7 +23,7 @@ class Screen {
   public:
   Screen(TFTDisplay &tft, AudioOutput *audioOutput) : m_tft(tft), m_audioOutput(audioOutput) {}
   // input
-  virtual void updatekey(SpecKeys key, uint8_t state) {};
+  virtual void updateKey(SpecKeys key, uint8_t state) {};
   virtual void pressKey(SpecKeys key) {};
   void playKeyClick() {
     if (m_audioOutput) {

firmware/src/Screens/USBKeyboardScreen.h

@@ -77,7 +77,7 @@ class USBKeyboardScreen : public Screen
     USB.begin();
   }
 
-  void updatekey(SpecKeys key, uint8_t state)
+  void updateKey(SpecKeys key, uint8_t state)
   {
     // map from the spectrum key to a hid_key
     int hid_key = 0;

firmware/src/main.cpp

@@ -105,7 +105,7 @@ void setup(void)
       [&](SpecKeys key, bool down)
       {
         {
-          navigationStack->updatekey(key, down);
+          navigationStack->updateKey(key, down);
         }
       });
   touchKeyboard->calibrate();
@@ -114,7 +114,7 @@ void setup(void)
 #ifdef TOUCH_KEYBOARD_V2
   TouchKeyboardV2 *touchKeyboard = new TouchKeyboardV2(
       [&](SpecKeys key, bool down) 
-      { navigationStack->updatekey(key, down); },
+      { navigationStack->updateKey(key, down); },
       [&](SpecKeys key)
       { navigationStack->pressKey(key); });
   touchKeyboard->start();
@@ -138,29 +138,42 @@ void setup(void)
   navigationStack->push(&menuPicker);
   // start off the keyboard and feed keys into the active scene
   SerialKeyboard *keyboard = new SerialKeyboard([&](SpecKeys key, bool down)
-                                                { navigationStack->updatekey(key, down); if (down) { navigationStack->pressKey(key); } });
+                                                { navigationStack->updateKey(key, down); if (down) { navigationStack->pressKey(key); } });
 
 // start up the nunchuk controller and feed events into the active screen
 #ifdef NUNCHUK_CLOCK
    Nunchuck *nunchuck = new Nunchuck([&](SpecKeys key, bool down)
-                                    { navigationStack->updatekey(key, down); },
+                                    { navigationStack->updateKey(key, down); },
                                     [&](SpecKeys key)
                                     { navigationStack->pressKey(key); },
                                     NUNCHUK_CLOCK, NUNCHUK_DATA);
 #endif
 #ifdef SEESAW_CLOCK
   AdafruitSeeSaw *seeSaw = new AdafruitSeeSaw([&](SpecKeys key, bool down)
-                                    { navigationStack->updatekey(key, down); },
+                                    { navigationStack->updateKey(key, down); },
                                     [&](SpecKeys key)
                                     { navigationStack->pressKey(key); });
   seeSaw->begin(SEESAW_DATA, SEESAW_CLOCK);
 #endif
 
   Serial.println("Running on core: " + String(xPortGetCoreID()));
+  // use the boot pin to open the emulator menu
+  pinMode(0, INPUT_PULLUP);
   // just keep running
+  bool bootButtonWasPressed = false;
   while (true)
   {
-    vTaskDelay(10000);
+    vTaskDelay(100 / portTICK_PERIOD_MS);
+    if (digitalRead(0) == LOW)
+    {
+      navigationStack->updateKey(SPECKEY_MENU, true);
+    }
+    else if (bootButtonWasPressed)
+    {
+      navigationStack->updateKey(SPECKEY_MENU, false);
+      navigationStack->pressKey(SPECKEY_MENU);
+      bootButtonWasPressed = false;
+    }
   }
 }