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

Merge pull request #2890 from prusa3d/MK3_3.9.2 

Merge MK3_3.9.2 into MK3
This commit is contained in:
DRracer 2020-11-13 13:03:35 +01:00 committed by GitHub
parent 04bb4b5dad 396ee0fde2
commit d013abfd52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Configuration.h
View File

@ -16,8 +16,8 @@ extern uint16_t nPrinterType;
extern PGM_P sPrinterName; extern PGM_P sPrinterName;
// Firmware version // Firmware version
#define FW_VERSION "3.9.1" #define FW_VERSION "3.9.2"
#define FW_COMMIT_NR 3518 #define FW_COMMIT_NR 3524
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.
#define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_DEV_VERSION FW_VERSION_UNKNOWN

22
Firmware/xyzcal.cpp
View File

@ -478,7 +478,7 @@ int16_t xyzcal_find_pattern_12x12_in_32x32(uint8_t* pixels, uint16_t* pattern, u
#define MAX_DIAMETR 600 #define MAX_DIAMETR 600
#define XYZCAL_FIND_CENTER_DIAGONAL #define XYZCAL_FIND_CENTER_DIAGONAL
int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us);
int8_t xyzcal_find_point_center2(uint16_t delay_us) int8_t xyzcal_find_point_center2(uint16_t delay_us)
{ {
printf_P(PSTR("xyzcal_find_point_center2\n")); printf_P(PSTR("xyzcal_find_point_center2\n"));
@ -494,7 +494,25 @@ int8_t xyzcal_find_point_center2(uint16_t delay_us)
xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1); xyzcal_lineXYZ_to(_X, _Y, z0 + 400, 500, -1);
xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1); xyzcal_lineXYZ_to(_X, _Y, z0 - 400, 500, 1);
z0 = _Z - 20; if (has_temperature_compensation()){
z0 = _Z - 20; // normal PINDA
return xyzcal_find_point_center2A(x0, y0, z0, delay_us);
} else {
// try searching harder, each PINDA is different
for(z0 = _Z - 20; z0 <= _Z + 140; z0 += 20 ){ // alternate PINDA
int8_t rv = xyzcal_find_point_center2A(x0, y0, z0, delay_us);
printf_P(PSTR(" z0=%d"), z0);
if( rv != 0 ){
printf_P(PSTR("ok\n"));
return rv;
} else {
printf_P(PSTR("fail\n"));
}
}
}
}
int8_t xyzcal_find_point_center2A(int16_t x0, int16_t y0, int16_t z0, uint16_t delay_us){
xyzcal_lineXYZ_to(_X, _Y, z0, 500, 0); xyzcal_lineXYZ_to(_X, _Y, z0, 500, 0);
// xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1); // xyzcal_lineXYZ_to(x0, y0, z0 - 100, 500, 1);