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

optimisation: extract common M861 code 

Change in memory:
Flash: -128 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-02-17 18:05:52 +00:00 committed by DRracer
parent 3381bf2f7e
commit 9f4a7adb9a
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Firmware/Marlin_main.cpp
View File

@ -3800,6 +3800,26 @@ static void gcode_G92()
} }
} }
/// @brief Helper function to reduce code size in M861
/// by extracting common code into one function
static void gcode_M861_print_pinda_cal_eeprom() {
int16_t usteps;
for (uint8_t i = 0; i < 6; i++) {
usteps = 0;
if(i > 0) {
usteps = eeprom_read_word((uint16_t*) EEPROM_PROBE_TEMP_SHIFT + (i - 1));
}
float mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS];
i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(35 + (i * 5));
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(usteps);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOLLN(mm * 1000);
}
}
#ifdef EXTENDED_CAPABILITIES_REPORT #ifdef EXTENDED_CAPABILITIES_REPORT
static void cap_line(const char* name, bool ena = false) { static void cap_line(const char* name, bool ena = false) {
@ -7906,24 +7926,10 @@ Sigma_Exit:
case 861: { case 861: {
const char * const _header = PSTR("index, temp, ustep, um"); const char * const _header = PSTR("index, temp, ustep, um");
if (code_seen('?')) { // ? - Print out current EEPROM offset values if (code_seen('?')) { // ? - Print out current EEPROM offset values
int16_t usteps = 0;
SERIAL_PROTOCOLPGM("PINDA cal status: "); SERIAL_PROTOCOLPGM("PINDA cal status: ");
SERIAL_PROTOCOLLN(calibration_status_pinda()); SERIAL_PROTOCOLLN(calibration_status_pinda());
SERIAL_PROTOCOLLNRPGM(_header); SERIAL_PROTOCOLLNRPGM(_header);
for (uint8_t i = 0; i < 6; i++) gcode_M861_print_pinda_cal_eeprom();
{
if(i > 0) {
usteps = eeprom_read_word((uint16_t*) EEPROM_PROBE_TEMP_SHIFT + (i - 1));
}
float mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS];
i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(35 + (i * 5));
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(usteps);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOLLN(mm * 1000);
}
} }
else if (code_seen('!')) { // ! - Set factory default values else if (code_seen('!')) { // ! - Set factory default values
eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1); eeprom_write_byte((uint8_t*)EEPROM_CALIBRATION_STATUS_PINDA, 1);
@ -7955,21 +7961,7 @@ Sigma_Exit:
eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + index, usteps); eeprom_update_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + index, usteps);
SERIAL_PROTOCOLLNRPGM(MSG_OK); SERIAL_PROTOCOLLNRPGM(MSG_OK);
SERIAL_PROTOCOLLNRPGM(_header); SERIAL_PROTOCOLLNRPGM(_header);
for (uint8_t i = 0; i < 6; i++) gcode_M861_print_pinda_cal_eeprom();
{
usteps = 0;
if (i > 0) {
usteps = eeprom_read_word((uint16_t*)EEPROM_PROBE_TEMP_SHIFT + (i - 1));
}
float mm = ((float)usteps) / cs.axis_steps_per_unit[Z_AXIS];
i == 0 ? SERIAL_PROTOCOLPGM("n/a") : SERIAL_PROTOCOL(i - 1);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(35 + (i * 5));
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOL(usteps);
SERIAL_PROTOCOLPGM(", ");
SERIAL_PROTOCOLLN(mm * 1000);
}
} }
} }
} }