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

Merge pull request #300 from XPila/MK3

Browse Source 
DISABLE_M42_M226 = +56 bytes RAM (because of stack overflow)
This commit is contained in:
XPila 2017-12-09 19:32:00 +01:00 committed by GitHub
commit 3b45d3de48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14675 additions and 14653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -9,7 +9,7 @@
// Firmware version // Firmware version
#define FW_version "3.1.1-RC1" #define FW_version "3.1.1-RC1"
#define FW_build 126 #define FW_build 127
//#define FW_build --BUILD-NUMBER-- //#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)

3
Firmware/Configuration_prusa.h
View File

@ -89,6 +89,9 @@ const bool Z_MIN_ENDSTOP_INVERTING = false; // set to true to invert the logic o
// Automatic recovery after crash is detected // Automatic recovery after crash is detected
#define AUTOMATIC_RECOVERY_AFTER_CRASH #define AUTOMATIC_RECOVERY_AFTER_CRASH
// Disable some commands
#define _DISABLE_M42_M226
//DEBUG //DEBUG
//#define _NO_ASM //#define _NO_ASM
#define DEBUG_DCODES //D codes #define DEBUG_DCODES //D codes

29316
Firmware/Firmware.ino.rambo.hex
View File

File diff suppressed because it is too large Load Diff

7
Firmware/Marlin_main.cpp
View File

@ -439,7 +439,9 @@ static float feedrate = 1500.0, next_feedrate, saved_feedrate;
// Also there is bool axis_relative_modes[] per axis flag. // Also there is bool axis_relative_modes[] per axis flag.
static bool relative_mode = false; static bool relative_mode = false;
#ifndef _DISABLE_M42_M226
const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42 const int sensitive_pins[] = SENSITIVE_PINS; // Sensitive pin list for M42
#endif //_DISABLE_M42_M226
//static float tt = 0; //static float tt = 0;
//static float bt = 0; //static float bt = 0;
@ -3902,6 +3904,7 @@ void process_commands()
autotempShutdown(); autotempShutdown();
} }
break; break;
#ifndef _DISABLE_M42_M226
case 42: //M42 -Change pin status via gcode case 42: //M42 -Change pin status via gcode
if (code_seen('S')) if (code_seen('S'))
{ {
@ -3929,7 +3932,7 @@ void process_commands()
} }
} }
break; break;
#endif //_DISABLE_M42_M226
case 44: // M44: Prusa3D: Reset the bed skew and offset calibration. case 44: // M44: Prusa3D: Reset the bed skew and offset calibration.
// Reset the baby step value and the baby step applied flag. // Reset the baby step value and the baby step applied flag.
@ -4945,6 +4948,7 @@ Sigma_Exit:
} }
break; break;
#ifndef _DISABLE_M42_M226
case 226: // M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required case 226: // M226 P<pin number> S<pin state>- Wait until the specified pin reaches the state required
{ {
if(code_seen('P')){ if(code_seen('P')){
@ -4996,6 +5000,7 @@ Sigma_Exit:
} }
} }
break; break;
#endif //_DISABLE_M42_M226
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds case 280: // M280 - set servo position absolute. P: servo index, S: angle or microseconds