Fix RESET detection when long-pressed

Author: ScrapComputing

firmware/src/CommonLogic.cpp

@@ -64,8 +64,12 @@ void CommonLogic::updateDisplay() {
     auto Now = std::chrono::system_clock::now();
     auto Seconds =
         std::chrono::duration_cast<std::chrono::seconds>(Now - *ResetTimeOpt);
-    int Remaining = ResetMaxSpeedDuration - Seconds.count();
-    Disp.printRaw(Remaining);
+    if (Seconds.count() == 0) {
+      Disp.printTxt(MsgResetDetected);
+    } else {
+      int Remaining = ResetMaxSpeedDuration - Seconds.count();
+      Disp.printRaw(Remaining);
+    }
     break;
   }
   }
@@ -132,15 +136,14 @@ void CommonLogic::resetSenseTick() {
       ResetTimeOpt = std::nullopt;
       DC.setKHz(ResetSavedKHz);
       DC.setPeriodRaw(ResetSavedPeriod);
-      printTxtAndSleep(MsgResetDetected);
       setMode(ResetSavedMode);
     }
   }
   // Button not pressed, skipping.
-  if (ResetSense.get() != ButtonState::Release)
+  if (ResetSense.get() != ButtonState::Pressed)
     return;
   // Nothing to do if already at max freq.
-  if (DC.getKHz() == Presets.getMaxKHz())
+  if (DC.getKHz() == Presets.getMaxKHz() && !ResetTimeOpt)
     return;
   // If already in booting mode don't save freq/period/mode.
   if (getMode() != Mode::Boot) {
@@ -152,7 +155,6 @@ void CommonLogic::resetSenseTick() {
                       << " SvPeriod=" << ResetSavedPeriod
                       << " SvMode=" << getModeStr(ResetSavedMode) << "\n";)
   DC.setMHzToMax();
-  printTxtAndSleep(MsgResetDetected);
   ResetTimeOpt = std::chrono::system_clock::now();
   setMode(Mode::Boot);
 }