Ver Fonte

Add missing CheckUserInput calls, fix bad array entry for FW_update

VintagePC há 2 anos atrás
pai
commit
f155c7664d
3 ficheiros alterados com 4 adições e 2 exclusões
  1. 2 0
      Firmware/mmu2.cpp
  2. 1 1
      Firmware/mmu2/errors_list.h
  3. 1 1
      Firmware/mmu2_error_converter.cpp

+ 2 - 0
Firmware/mmu2.cpp

@@ -555,6 +555,7 @@ void MMU2::manage_response(const bool move_axes, const bool turn_off_nozzle) {
             st_synchronize(); 
             return;
         case VersionMismatch: // this basically means the MMU will be disabled until reconnected
+            CheckUserInput();
             return;
         case CommunicationTimeout:
         case CommandError:
@@ -597,6 +598,7 @@ StepStatus MMU2::LogicStep() {
     case VersionMismatch:
         StopKeepPowered();
         ReportError(ErrorCode::VERSION_MISMATCH);
+        CheckUserInput();
         break;
     default:
         break;

+ 1 - 1
Firmware/mmu2/errors_list.h

@@ -110,7 +110,7 @@ static const constexpr uint16_t errorCodes[] PROGMEM = {
     ERR_SYSTEM_INVALID_TOOL, 
     ERR_SYSTEM_QUEUE_FULL, 
     ERR_SYSTEM_FW_UPDATE_NEEDED, 
-    ERR_SYSTEM_FW_UPDATE_NEEDED,
+    ERR_SYSTEM_FW_RUNTIME_ERROR,
     ERR_SYSTEM_UNLOAD_MANUALLY
 };
 

+ 1 - 1
Firmware/mmu2_error_converter.cpp

@@ -249,7 +249,7 @@ Buttons ButtonPressed(uint16_t ec) {
         break;
     case ERR_SYSTEM_FW_UPDATE_NEEDED:
         switch (buttonSelectedOperation) {
-        case ButtonOperations::DisableMMU: // "Restart MMU"
+        case ButtonOperations::DisableMMU: // "Disable"
             return DisableMMU;
         default:
             break;