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

G80: Change 'correction' data type to int8_t 

Valid values range from -100 to 100. Storing this value as four bytes
(int32_t) is not efficient.

Instead we can store G80 user input temporarily as int32_t and check
if the value is within the allowed range. If it is, then we convert the
int32_t (4 bytes) to int8_t (1 byte).

Change in memory:
Flash: -78 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2022-12-30 15:26:53 +00:00 committed by DRracer
parent 956efde822
commit 7de725f840
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Firmware/Marlin_main.cpp
View File

@ -3091,7 +3091,7 @@ static void gcode_G80()
} }
#endif // SUPPORT_VERBOSITY #endif // SUPPORT_VERBOSITY
const constexpr uint8_t sides = 4; const constexpr uint8_t sides = 4;
long correction[sides] = {0}; int8_t correction[sides] = {0};
for (uint8_t i = 0; i < sides; ++i) { for (uint8_t i = 0; i < sides; ++i) {
static const char codes[sides] PROGMEM = { 'L', 'R', 'F', 'B' }; static const char codes[sides] PROGMEM = { 'L', 'R', 'F', 'B' };
static uint8_t *const eep_addresses[sides] PROGMEM = { static uint8_t *const eep_addresses[sides] PROGMEM = {
@ -3101,19 +3101,22 @@ static void gcode_G80()
(uint8_t*)EEPROM_BED_CORRECTION_REAR, (uint8_t*)EEPROM_BED_CORRECTION_REAR,
}; };
if (code_seen(pgm_read_byte(&codes[i]))) if (code_seen(pgm_read_byte(&codes[i])))
correction[i] = code_value_long(); { // Verify value is within allowed range
else if (eeprom_bed_correction_valid) int32_t temp = code_value_long();
if (labs(temp) > BED_ADJUSTMENT_UM_MAX) {
SERIAL_ERROR_START;
SERIAL_ECHOPGM("Excessive bed leveling correction: ");
SERIAL_ECHO(temp);
SERIAL_ECHOLNPGM(" microns");
correction[i] = 0;
} else {
// Value is valid, save it
correction[i] = (int8_t)temp;
}
} else if (eeprom_bed_correction_valid)
correction[i] = (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])); correction[i] = (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i]));
if (correction[i] == 0) if (correction[i] == 0)
continue; continue;
if (labs(correction[i]) > BED_ADJUSTMENT_UM_MAX) {
SERIAL_ERROR_START;
SERIAL_ECHOPGM("Excessive bed leveling correction: ");
SERIAL_ECHO(correction[i]);
SERIAL_ECHOLNPGM(" microns");
correction[i] = 0;
}
} }
for (uint8_t row = 0; row < nMeasPoints; ++row) { for (uint8_t row = 0; row < nMeasPoints; ++row) {
for (uint8_t col = 0; col < nMeasPoints; ++col) { for (uint8_t col = 0; col < nMeasPoints; ++col) {