josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove duplicate function in planner 

moves_planned() should be used instead

No change in memory
This commit is contained in:
Guðni Már Gilbert 2023-03-03 21:11:16 +00:00
parent 03280c48d5
commit 0b261ad4de
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Firmware/Marlin_main.cpp
View File

@ -10984,9 +10984,6 @@ void restore_print_from_eeprom(bool mbl_was_active) {
void stop_and_save_print_to_ram(float z_move, float e_move) void stop_and_save_print_to_ram(float z_move, float e_move)
{ {
if (saved_printing) return; if (saved_printing) return;
#if 0
unsigned char nplanner_blocks;
#endif
unsigned char nlines; unsigned char nlines;
uint16_t sdlen_planner; uint16_t sdlen_planner;
uint16_t sdlen_cmdqueue; uint16_t sdlen_cmdqueue;
@ -10994,16 +10991,12 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
cli(); cli();
if (card.sdprinting) { if (card.sdprinting) {
#if 0
nplanner_blocks = number_of_blocks();
#endif
saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue saved_sdpos = sdpos_atomic; //atomic sd position of last command added in queue
sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner sdlen_planner = planner_calc_sd_length(); //length of sd commands in planner
saved_sdpos -= sdlen_planner; saved_sdpos -= sdlen_planner;
sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue sdlen_cmdqueue = cmdqueue_calc_sd_length(); //length of sd commands in cmdqueue
saved_sdpos -= sdlen_cmdqueue; saved_sdpos -= sdlen_cmdqueue;
saved_printing_type = PRINTING_TYPE_SD; saved_printing_type = PRINTING_TYPE_SD;
} }
else if (usb_timer.running()) { //reuse saved_sdpos for storing line number else if (usb_timer.running()) { //reuse saved_sdpos for storing line number
saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue saved_sdpos = gcode_LastN; //start with line number of command added recently to cmd queue
@ -11023,7 +11016,7 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
SERIAL_ECHOPGM("SDPOS="); MYSERIAL.println(card.get_sdpos(), DEC); SERIAL_ECHOPGM("SDPOS="); MYSERIAL.println(card.get_sdpos(), DEC);
SERIAL_ECHOPGM("SDLEN_PLAN="); MYSERIAL.println(sdlen_planner, DEC); SERIAL_ECHOPGM("SDLEN_PLAN="); MYSERIAL.println(sdlen_planner, DEC);
SERIAL_ECHOPGM("SDLEN_CMDQ="); MYSERIAL.println(sdlen_cmdqueue, DEC); SERIAL_ECHOPGM("SDLEN_CMDQ="); MYSERIAL.println(sdlen_cmdqueue, DEC);
SERIAL_ECHOPGM("PLANNERBLOCKS="); MYSERIAL.println(int(nplanner_blocks), DEC); SERIAL_ECHOPGM("PLANNERBLOCKS="); MYSERIAL.println(int(moves_planned()), DEC);
SERIAL_ECHOPGM("SDSAVED="); MYSERIAL.println(saved_sdpos, DEC); SERIAL_ECHOPGM("SDSAVED="); MYSERIAL.println(saved_sdpos, DEC);
//SERIAL_ECHOPGM("SDFILELEN="); MYSERIAL.println(card.fileSize(), DEC); //SERIAL_ECHOPGM("SDFILELEN="); MYSERIAL.println(card.fileSize(), DEC);

4
Firmware/planner.cpp
View File

@ -1411,10 +1411,6 @@ void update_mode_profile()
} }
#endif //TMC2130 #endif //TMC2130
uint8_t number_of_blocks()
{
return (block_buffer_head + BLOCK_BUFFER_SIZE - block_buffer_tail) & (BLOCK_BUFFER_SIZE - 1);
}
#ifdef PLANNER_DIAGNOSTICS #ifdef PLANNER_DIAGNOSTICS
uint8_t planner_queue_min() uint8_t planner_queue_min()
{ {

2
Firmware/planner.h
View File

@ -274,8 +274,6 @@ void reset_acceleration_rates();
void update_mode_profile(); void update_mode_profile();
uint8_t number_of_blocks();
// #define PLANNER_DIAGNOSTICS // #define PLANNER_DIAGNOSTICS
#ifdef PLANNER_DIAGNOSTICS #ifdef PLANNER_DIAGNOSTICS
// Diagnostic functions to display planner buffer underflow on the display. // Diagnostic functions to display planner buffer underflow on the display.