bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

M166 Gradients, LCD Menu for 2-channel Mixer (Geeetech A10M/A20M) (#13022)

Browse Source
This commit is contained in:
Scott Lahteine
2019-02-10 04:54:23 -06:00
committed by GitHub
parent 7ee35c2611
commit 6de3d34378
114 changed files with 9901 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/module/planner.cpp
View File

@ -2584,6 +2584,10 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
COPY(position_float, target_float);
#endif
#if ENABLED(GRADIENT_MIX)
mixer.gradient_control(target_float[Z_AXIS]);
#endif
// Movement was accepted
return true;
} // _populate_block()

2
Marlin/src/module/planner.h
View File

@ -159,7 +159,7 @@ typedef struct block_t {
} block_t;
#define HAS_POSITION_FLOAT (ENABLED(LIN_ADVANCE) || ENABLED(SCARA_FEEDRATE_SCALING))
#define HAS_POSITION_FLOAT (ENABLED(LIN_ADVANCE) || ENABLED(SCARA_FEEDRATE_SCALING) || ENABLED(GRADIENT_MIX))
#define BLOCK_MOD(n) ((n)&(BLOCK_BUFFER_SIZE-1))