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

Bed correction code optimization 

flash: -44
This commit is contained in:
Alex Voinea 2023-05-06 15:27:11 +02:00
parent 5b8c65e342
commit 2d0b96fe6a
No known key found for this signature in database
GPG Key ID: 37EDFD565CB33BAD
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Firmware/Marlin_main.cpp
View File

@ -3014,31 +3014,28 @@ static void gcode_G80()
#endif #endif
babystep_apply(); // Apply Z height correction aka baby stepping before mesh bed leveing gets activated. babystep_apply(); // Apply Z height correction aka baby stepping before mesh bed leveing gets activated.
// Apply the bed level correction to the mesh
bool eeprom_bed_correction_valid = eeprom_read_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID) == 1; bool eeprom_bed_correction_valid = eeprom_read_byte((unsigned char*)EEPROM_BED_CORRECTION_VALID) == 1;
const constexpr uint8_t sides = 4; auto bedCorrectHelper = [&] (char code, uint8_t *eep_address) -> int8_t {
int8_t correction[sides]; if (code_seen(code)) {
for (uint8_t i = 0; i < sides; ++i) {
static const char codes[sides] PROGMEM = { 'L', 'R', 'F', 'B' };
static uint8_t *const eep_addresses[sides] PROGMEM = {
(uint8_t*)EEPROM_BED_CORRECTION_LEFT,
(uint8_t*)EEPROM_BED_CORRECTION_RIGHT,
(uint8_t*)EEPROM_BED_CORRECTION_FRONT,
(uint8_t*)EEPROM_BED_CORRECTION_REAR,
};
if (code_seen(pgm_read_byte(&codes[i]))) {
// Verify value is within allowed range // Verify value is within allowed range
int32_t temp = code_value_long(); int16_t temp = code_value_short();
if (labs(temp) > BED_ADJUSTMENT_UM_MAX) { if (abs(temp) > BED_ADJUSTMENT_UM_MAX) {
printf_P(PSTR("%SExcessive bed leveling correction: %li microns\n"), errormagic, temp); printf_P(PSTR("%SExcessive bed leveling correction: %i microns\n"), errormagic, temp);
correction[i] = 0;
} else { } else {
// Value is valid, save it return (int8_t)temp; // Value is valid, use it
correction[i] = (int8_t)temp;
} }
} else { } else if (eeprom_bed_correction_valid) {
correction[i] = eeprom_bed_correction_valid ? (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])) : 0; return (int8_t)eeprom_read_byte(eep_address);
} }
} return 0;
};
int8_t correction[4] = {
bedCorrectHelper('L', (uint8_t*)EEPROM_BED_CORRECTION_LEFT),
bedCorrectHelper('R', (uint8_t*)EEPROM_BED_CORRECTION_RIGHT),
bedCorrectHelper('F', (uint8_t*)EEPROM_BED_CORRECTION_FRONT),
bedCorrectHelper('B', (uint8_t*)EEPROM_BED_CORRECTION_REAR),
};
for (uint8_t row = 0; row < MESH_NUM_Y_POINTS; row++) { for (uint8_t row = 0; row < MESH_NUM_Y_POINTS; row++) {
for (uint8_t col = 0; col < MESH_NUM_X_POINTS; col++) { for (uint8_t col = 0; col < MESH_NUM_X_POINTS; col++) {
constexpr float scaler = 0.001f / (MESH_NUM_X_POINTS - 1); constexpr float scaler = 0.001f / (MESH_NUM_X_POINTS - 1);