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

Merge pull request #69 from XPila/MK3

Browse Source 
Endless loop after calibration Z (http://jira.prusa/projects/PFW/issu…
This commit is contained in:
XPila 2017-10-17 21:06:18 +02:00 committed by GitHub
commit 88a3ea0ddf
4 changed files with 14350 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Configuration.h
View File

@ -4,8 +4,14 @@
#include "boards.h"
#include "Configuration_prusa.h"
#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
// Firmware version
#define FW_version "3.0.12-RC2"
#define FW_build 100
#define FW_version_build FW_version " b" STR(FW_build)
#define FW_PRUSA3D_MAGIC "PRUSA3DFW"
#define FW_PRUSA3D_MAGIC_LEN 10

14336
Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full/Firmware.ino.rambo_b100.hex Normal file
View File

File diff suppressed because it is too large Load Diff

7
Firmware/tmc2130.cpp
View File

@ -212,8 +212,8 @@ uint8_t tmc2130_sample_diag()
uint8_t mask = 0;
if (READ(X_TMC2130_DIAG)) mask |= X_AXIS_MASK;
if (READ(Y_TMC2130_DIAG)) mask |= Y_AXIS_MASK;
if (READ(Z_TMC2130_DIAG)) mask |= Z_AXIS_MASK;
if (READ(E0_TMC2130_DIAG)) mask |= E_AXIS_MASK;
// if (READ(Z_TMC2130_DIAG)) mask |= Z_AXIS_MASK;
// if (READ(E0_TMC2130_DIAG)) mask |= E_AXIS_MASK;
return mask;
}
@ -222,7 +222,8 @@ void tmc2130_st_isr(uint8_t last_step_mask)
if (tmc2130_mode == TMC2130_MODE_SILENT) return;
bool crash = false;
uint8_t diag_mask = tmc2130_sample_diag();
for (uint8_t axis = X_AXIS; axis <= E_AXIS; axis++)
// for (uint8_t axis = X_AXIS; axis <= E_AXIS; axis++)
for (uint8_t axis = X_AXIS; axis <= Y_AXIS; axis++)
{
uint8_t mask = (X_AXIS_MASK << axis);
if (diag_mask & mask) tmc2130_sg_err[axis]++;

6
Firmware/ultralcd.cpp
View File

@ -1034,13 +1034,15 @@ static void lcd_support_menu()
MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
MENU_ITEM(back, PSTR("Firmware:"), lcd_main_menu);
MENU_ITEM(back, PSTR(" " FW_version_build), lcd_main_menu);
// Ideally this block would be optimized out by the compiler.
const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P());
/* const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P());
if (fw_string_len < 6) {
MENU_ITEM(back, PSTR(MSG_FW_VERSION " - " FW_version), lcd_main_menu);
} else {
MENU_ITEM(back, PSTR("FW - " FW_version), lcd_main_menu);
}
}*/
MENU_ITEM(back, MSG_PRUSA3D, lcd_main_menu);
MENU_ITEM(back, MSG_PRUSA3D_FORUM, lcd_main_menu);