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

Reduce code size in first layer calibration 

Pull out common enqueuing loop into one function

Change in memory:
Flash: -70 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-03-18 18:17:36 +00:00 committed by DRracer
parent 5b04812017
commit 5ef00fb78a
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Firmware/first_lay_cal.cpp
View File

@ -33,6 +33,14 @@ static constexpr float spacing(float layer_height, float extrusion_width, float
return extrusion_width - layer_height * (overlap_factor - M_PI/4); return extrusion_width - layer_height * (overlap_factor - M_PI/4);
} }
// Common code extracted into one function to reduce code size
static void lay1cal_common_enqueue_loop(const char * const * cmd_sequence) {
for (uint8_t i = 0; i < (sizeof(cmd_sequence)/sizeof(cmd_sequence[0])); ++i)
{
enquecommand_P(static_cast<char*>(pgm_read_ptr(&cmd_sequence[i])));
}
}
static const char extrude_fmt[] PROGMEM = "G1 X%d Y%d E%-.5f"; static const char extrude_fmt[] PROGMEM = "G1 X%d Y%d E%-.5f";
static const char zero_extrusion[] PROGMEM = "G92 E0"; static const char zero_extrusion[] PROGMEM = "G92 E0";
@ -48,10 +56,7 @@ void lay1cal_wait_preheat()
zero_extrusion zero_extrusion
}; };
for (uint8_t i = 0; i < (sizeof(preheat_cmd)/sizeof(preheat_cmd[0])); ++i) lay1cal_common_enqueue_loop(preheat_cmd);
{
enquecommand_P(preheat_cmd[i]);
}
} }
//! @brief Load filament //! @brief Load filament
@ -148,10 +153,7 @@ void lay1cal_before_meander()
cmd_pre_meander_7, cmd_pre_meander_7,
}; };
for (uint8_t i = 0; i < (sizeof(cmd_pre_meander)/sizeof(cmd_pre_meander[0])); ++i) lay1cal_common_enqueue_loop(cmd_pre_meander);
{
enquecommand_P(static_cast<char*>(pgm_read_ptr(&cmd_pre_meander[i])));
}
} }
//! @brief Print meander start //! @brief Print meander start
@ -237,10 +239,7 @@ void lay1cal_finish(bool mmu_enabled)
cmd_cal_finish_5 cmd_cal_finish_5
}; };
for (uint8_t i = 0; i < (sizeof(cmd_cal_finish)/sizeof(cmd_cal_finish[0])); ++i) lay1cal_common_enqueue_loop(cmd_cal_finish);
{
enquecommand_P(static_cast<char*>(pgm_read_ptr(&cmd_cal_finish[i])));
}
if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle if (mmu_enabled) enquecommand_P(MSG_M702_NO_LIFT); //unload from nozzle
enquecommand_P(MSG_M84);// disable motors enquecommand_P(MSG_M84);// disable motors