Bladeren bron

🐛 Fix serial PORT_RESTORE (and BUFFER_MONITORING) (#23022)

somehibs 3 jaren geleden
bovenliggende
commit
3f6c8d5dc5
No account linked to committer's email address
3 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 1
    1
      Marlin/src/core/serial.h
  2. 1
    1
      Marlin/src/gcode/queue.cpp
  3. 1
    1
      Marlin/src/libs/autoreport.h

+ 1
- 1
Marlin/src/core/serial.h Bestand weergeven

87
 //         interface with the ability to output to multiple serial ports.
87
 //         interface with the ability to output to multiple serial ports.
88
 #if HAS_MULTI_SERIAL
88
 #if HAS_MULTI_SERIAL
89
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
89
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
90
-  #define _PORT_RESTORE(n,p)  RESTORE(n)
90
+  #define _PORT_RESTORE(n)    RESTORE(n)
91
   #define SERIAL_ASSERT(P)    if (multiSerial.portMask!=(P)) { debugger(); }
91
   #define SERIAL_ASSERT(P)    if (multiSerial.portMask!=(P)) { debugger(); }
92
   // If we have a catchall, use that directly
92
   // If we have a catchall, use that directly
93
   #ifdef SERIAL_CATCHALL
93
   #ifdef SERIAL_CATCHALL

+ 1
- 1
Marlin/src/gcode/queue.cpp Bestand weergeven

719
 
719
 
720
     if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
720
     if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
721
       next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
721
       next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
722
-      PORT_REDIRECT(SERIAL_BOTH);
722
+      PORT_REDIRECT(SerialMask::All);
723
       report_buffer_statistics();
723
       report_buffer_statistics();
724
       PORT_RESTORE();
724
       PORT_RESTORE();
725
     }
725
     }

+ 1
- 1
Marlin/src/libs/autoreport.h Bestand weergeven

44
       next_report_ms = ms + SEC_TO_MS(report_interval);
44
       next_report_ms = ms + SEC_TO_MS(report_interval);
45
       PORT_REDIRECT(report_port_mask);
45
       PORT_REDIRECT(report_port_mask);
46
       Helper::report();
46
       Helper::report();
47
-      //PORT_RESTORE();
47
+      PORT_RESTORE();
48
     }
48
     }
49
   }
49
   }
50
 };
50
 };

Laden…
Annuleren
Opslaan