瀏覽代碼

Show manual extrusion moves as relative in LCD

- Implements FR#11724
- Old behavior can be restored by commenting out MANUAL_E_MOVES_RELATIVE
Marcio Teixeira 6 年之前
父節點
當前提交
beb51c2d58
共有 3 個檔案被更改,包括 14 行新增1 行删除
  1. 1
    0
      Marlin/Configuration_adv.h
  2. 1
    0
      Marlin/src/config/default/Configuration_adv.h
  3. 12
    1
      Marlin/src/lcd/ultralcd.cpp

+ 1
- 0
Marlin/Configuration_adv.h 查看文件

425
 
425
 
426
 #if ENABLED(ULTIPANEL)
426
 #if ENABLED(ULTIPANEL)
427
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
427
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
428
+  #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
428
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
429
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
429
 #endif
430
 #endif
430
 
431
 

+ 1
- 0
Marlin/src/config/default/Configuration_adv.h 查看文件

425
 
425
 
426
 #if ENABLED(ULTIPANEL)
426
 #if ENABLED(ULTIPANEL)
427
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
427
   #define MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60} // Feedrates for manual moves along X, Y, Z, E from panel
428
+  #define MANUAL_E_MOVES_RELATIVE // Show LCD extruder moves as relative rather than absolute positions
428
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
429
   #define ULTIPANEL_FEEDMULTIPLY  // Comment to disable setting feedrate multiplier via encoder
429
 #endif
430
 #endif
430
 
431
 

+ 12
- 1
Marlin/src/lcd/ultralcd.cpp 查看文件

477
     #define manual_move_e_index 0
477
     #define manual_move_e_index 0
478
   #endif
478
   #endif
479
 
479
 
480
+  #if ENABLED(MANUAL_E_MOVES_RELATIVE)
481
+    float manual_move_e_origin = 0;
482
+  #endif
483
+
480
   #if IS_KINEMATIC
484
   #if IS_KINEMATIC
481
     bool processing_manual_move = false;
485
     bool processing_manual_move = false;
482
     float manual_move_offset = 0;
486
     float manual_move_offset = 0;
3066
         #if IS_KINEMATIC
3070
         #if IS_KINEMATIC
3067
           + manual_move_offset
3071
           + manual_move_offset
3068
         #endif
3072
         #endif
3073
+        #if ENABLED(MANUAL_E_MOVES_RELATIVE)
3074
+          - manual_move_e_origin
3075
+        #endif
3069
       ));
3076
       ));
3070
     }
3077
     }
3071
   }
3078
   }
3114
         case Z_AXIS:
3121
         case Z_AXIS:
3115
           STATIC_ITEM(MSG_MOVE_Z, true, true); break;
3122
           STATIC_ITEM(MSG_MOVE_Z, true, true); break;
3116
         default:
3123
         default:
3117
-          STATIC_ITEM(MSG_MOVE_E, true, true); break;
3124
+          #if ENABLED(MANUAL_E_MOVES_RELATIVE)
3125
+            manual_move_e_origin = current_position[E_AXIS];
3126
+          #endif
3127
+          STATIC_ITEM(MSG_MOVE_E, true, true);
3128
+          break;
3118
       }
3129
       }
3119
     }
3130
     }
3120
     MENU_BACK(MSG_MOVE_AXIS);
3131
     MENU_BACK(MSG_MOVE_AXIS);

Loading…
取消
儲存