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

G80 minor optimization

This commit is contained in:
Alex Voinea 2023-05-05 18:56:26 +02:00
parent a5c20a1c6e
commit 67945579de
No known key found for this signature in database
GPG Key ID: 37EDFD565CB33BAD
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Marlin_main.cpp
View File

@ -3015,6 +3015,7 @@ static void gcode_G80()
if(eeprom_read_byte((uint8_t *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() == true) temp_compensation_apply(); //apply PINDA temperature compensation if(eeprom_read_byte((uint8_t *)EEPROM_TEMP_CAL_ACTIVE) && calibration_status_pinda() == true) temp_compensation_apply(); //apply PINDA temperature compensation
#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.
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; const constexpr uint8_t sides = 4;
int8_t correction[sides]; int8_t correction[sides];
@ -3036,19 +3037,18 @@ static void gcode_G80()
// Value is valid, save it // Value is valid, save it
correction[i] = (int8_t)temp; 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]));
} else { } else {
correction[i] = 0; correction[i] = eeprom_bed_correction_valid ? (int8_t)eeprom_read_byte((uint8_t*)pgm_read_ptr(&eep_addresses[i])) : 0;
} }
} }
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++) {
mbl.z_values[row][col] +=0.001f * ( constexpr float scaler = 0.001f / (MESH_NUM_X_POINTS - 1);
mbl.z_values[row][col] += scaler * (
+ correction[0] * (MESH_NUM_X_POINTS - 1 - col) + correction[0] * (MESH_NUM_X_POINTS - 1 - col)
+ correction[1] * col + correction[1] * col
+ correction[2] * (MESH_NUM_Y_POINTS - 1 - row) + correction[2] * (MESH_NUM_Y_POINTS - 1 - row)
+ correction[3] * row) / (float)(MESH_NUM_X_POINTS - 1); + correction[3] * row);
} }
} }