소스 검색

PFW-1354 Fix slow button processing (#37)

* Fix MK3S buttons being processed too slowly

After a button is selected on the MK3S MMU error screen, we need to process it before asking for another MMU Query.

Because the MMU Query will make the Error screen return and overwrite the status screen

* Add back CheckUserInput for ButtonPushed event
Guðni Már Gilbert 2 년 전
부모
커밋
6b7a018f9b
1개의 변경된 파일2개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 5
      Firmware/mmu2.cpp

+ 2 - 5
Firmware/mmu2.cpp

@@ -678,6 +678,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
 }
 
 StepStatus MMU2::LogicStep() {
+    CheckUserInput(); // Process any buttons before proceeding with another MMU Query
     StepStatus ss = logic.Step();
     switch (ss) {
     case Finished:
@@ -686,27 +687,23 @@ StepStatus MMU2::LogicStep() {
         break;
     case CommandError:
         ReportError(logic.Error(), ErrorSourceMMU);
-        CheckUserInput();
         break;
     case CommunicationTimeout:
         state = xState::Connecting;
         ReportError(ErrorCode::MMU_NOT_RESPONDING, ErrorSourcePrinter);
-        CheckUserInput();
         break;
     case ProtocolError:
         state = xState::Connecting;
         ReportError(ErrorCode::PROTOCOL_ERROR, ErrorSourcePrinter);
-        CheckUserInput();
         break;
     case VersionMismatch:
         StopKeepPowered();
         ReportError(ErrorCode::VERSION_MISMATCH, ErrorSourcePrinter);
-        CheckUserInput();
         break;
     case ButtonPushed:
         lastButton = logic.Button();
         LogEchoEvent("MMU Button pushed");
-        CheckUserInput();
+        CheckUserInput(); // Process the button immediately
         break;
     default:
         break;