Browse Source

Merge pull request #3413 from leptun/MK3_fix_timer_polling

Make some timers LongTimer
Alex Voinea 2 years ago
parent
commit
536395eabf
4 changed files with 6 additions and 6 deletions
  1. 1 1
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/cmdqueue.cpp
  3. 3 3
      Firmware/mmu.cpp
  4. 1 1
      Firmware/mmu.h

+ 1 - 1
Firmware/Marlin_main.cpp

@@ -199,7 +199,7 @@ unsigned long pause_time = 0;
 unsigned long start_pause_print = _millis();
 unsigned long t_fan_rising_edge = _millis();
 LongTimer safetyTimer;
-static ShortTimer crashDetTimer;
+static LongTimer crashDetTimer;
 
 //unsigned long load_filament_time;
 

+ 1 - 1
Firmware/cmdqueue.cpp

@@ -24,7 +24,7 @@ int serial_count = 0;  //index of character read from serial line
 bool comment_mode = false;
 char *strchr_pointer; // just a pointer to find chars in the command string like X, Y, Z, E, etc
 
-ShortTimer farm_incomplete_command_timeout_timer;
+LongTimer farm_incomplete_command_timeout_timer;
 
 long gcode_N = 0;
 long gcode_LastN = 0;

+ 3 - 3
Firmware/mmu.cpp

@@ -75,9 +75,9 @@ int16_t mmu_version = -1;
 
 int16_t mmu_buildnr = -1;
 
-ShortTimer mmu_last_request;
-ShortTimer mmu_last_response;
-ShortTimer mmu_last_finda_response;
+LongTimer mmu_last_request;
+LongTimer mmu_last_response;
+LongTimer mmu_last_finda_response;
 
 MmuCmd mmu_last_cmd = MmuCmd::None;
 uint16_t mmu_power_failures = 0;

+ 1 - 1
Firmware/mmu.h

@@ -15,7 +15,7 @@ extern uint8_t mmu_extruder;
 extern uint8_t tmp_extruder;
 
 extern int8_t mmu_finda;
-extern ShortTimer mmu_last_finda_response;
+extern LongTimer mmu_last_finda_response;
 extern bool ir_sensor_detected;
 
 extern int16_t mmu_version;