Browse Source

move engaged from lcd console refreshes power off timeout

Josef Pavlik 10 years ago
parent
commit
477b6fa1df
3 changed files with 9 additions and 0 deletions
  1. 2
    0
      Marlin/Marlin.h
  2. 4
    0
      Marlin/Marlin_main.cpp
  3. 3
    0
      Marlin/ultralcd.cpp

+ 2
- 0
Marlin/Marlin.h View File

189
 void prepare_arc_move(char isclockwise);
189
 void prepare_arc_move(char isclockwise);
190
 void clamp_to_software_endstops(float target[3]);
190
 void clamp_to_software_endstops(float target[3]);
191
 
191
 
192
+void refresh_cmd_timeout(void);
193
+
192
 #ifdef FAST_PWM_FAN
194
 #ifdef FAST_PWM_FAN
193
 void setPwmFrequency(uint8_t pin, int val);
195
 void setPwmFrequency(uint8_t pin, int val);
194
 #endif
196
 #endif

+ 4
- 0
Marlin/Marlin_main.cpp View File

1046
   }
1046
   }
1047
 }
1047
 }
1048
 #define HOMEAXIS(LETTER) homeaxis(LETTER##_AXIS)
1048
 #define HOMEAXIS(LETTER) homeaxis(LETTER##_AXIS)
1049
++void refresh_cmd_timeout(void)
1050
+{
1051
+  previous_millis_cmd = millis();
1052
+}
1049
 
1053
 
1050
 void process_commands()
1054
 void process_commands()
1051
 {
1055
 {

+ 3
- 0
Marlin/ultralcd.cpp View File

460
 {
460
 {
461
     if (encoderPosition != 0)
461
     if (encoderPosition != 0)
462
     {
462
     {
463
+        refresh_cmd_timeout();
463
         current_position[X_AXIS] += float((int)encoderPosition) * move_menu_scale;
464
         current_position[X_AXIS] += float((int)encoderPosition) * move_menu_scale;
464
         if (min_software_endstops && current_position[X_AXIS] < X_MIN_POS)
465
         if (min_software_endstops && current_position[X_AXIS] < X_MIN_POS)
465
             current_position[X_AXIS] = X_MIN_POS;
466
             current_position[X_AXIS] = X_MIN_POS;
489
 {
490
 {
490
     if (encoderPosition != 0)
491
     if (encoderPosition != 0)
491
     {
492
     {
493
+        refresh_cmd_timeout();
492
         current_position[Y_AXIS] += float((int)encoderPosition) * move_menu_scale;
494
         current_position[Y_AXIS] += float((int)encoderPosition) * move_menu_scale;
493
         if (min_software_endstops && current_position[Y_AXIS] < Y_MIN_POS)
495
         if (min_software_endstops && current_position[Y_AXIS] < Y_MIN_POS)
494
             current_position[Y_AXIS] = Y_MIN_POS;
496
             current_position[Y_AXIS] = Y_MIN_POS;
518
 {
520
 {
519
     if (encoderPosition != 0)
521
     if (encoderPosition != 0)
520
     {
522
     {
523
+        refresh_cmd_timeout();
521
         current_position[Z_AXIS] += float((int)encoderPosition) * move_menu_scale;
524
         current_position[Z_AXIS] += float((int)encoderPosition) * move_menu_scale;
522
         if (min_software_endstops && current_position[Z_AXIS] < Z_MIN_POS)
525
         if (min_software_endstops && current_position[Z_AXIS] < Z_MIN_POS)
523
             current_position[Z_AXIS] = Z_MIN_POS;
526
             current_position[Z_AXIS] = Z_MIN_POS;

Loading…
Cancel
Save