Merge pull request #363 from XPila/MK3

Mk3
This commit is contained in:
XPila 2017-12-30 02:56:09 +01:00 committed by GitHub
commit 24f990820e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13630 additions and 13618 deletions

View file

@ -9,9 +9,9 @@
// Firmware version
#define FW_version "3.1.1-RC4"
#define FW_build 142
#define FW_build 143
//#define FW_build --BUILD-NUMBER--
#define FW_version_build FW_version " b" STR(FW_build)
#define FW_version_build FW_version " b" STR(FW_build) "a"
#define FW_PRUSA3D_MAGIC "PRUSA3DFW"

File diff suppressed because it is too large Load diff

View file

@ -662,9 +662,9 @@ void isr() {
}
for(uint8_t i=0; i < step_loops; i++) { // Take multiple steps per interrupt (For high speed moves)
/* #ifndef AT90USB
#ifndef AT90USB
MSerial.checkRx(); // Check for serial chars.
#endif*/ //RP - removed
#endif //RP - returned, because missing characters
#ifdef LIN_ADVANCE
counter_e += current_block->steps_e;