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

Use C++ language supported 'nullptr' (#13944)

Browse Source
This commit is contained in:
Scott Lahteine
2019-05-09 11:45:55 -05:00
committed by GitHub
parent e53d7e5517
commit ad4ffa1d2f
70 changed files with 670 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/module/stepper.cpp
View File

@ -133,7 +133,7 @@ Stepper stepper; // Singleton
// private:
block_t* Stepper::current_block; // (= NULL) A pointer to the block currently being traced
block_t* Stepper::current_block; // (= nullptr) A pointer to the block currently being traced
uint8_t Stepper::last_direction_bits, // = 0
Stepper::axis_did_move; // = 0
@ -1394,7 +1394,7 @@ void Stepper::stepper_pulse_phase_isr() {
abort_current_block = false;
if (current_block) {
axis_did_move = 0;
current_block = NULL;
current_block = nullptr;
planner.discard_current_block();
}
}
@ -1541,7 +1541,7 @@ uint32_t Stepper::stepper_block_phase_isr() {
runout.block_completed(current_block);
#endif
axis_did_move = 0;
current_block = NULL;
current_block = nullptr;
planner.discard_current_block();
}
else {