Merge pull request #7992 from thinkyhead/bf2_M106_memorize
[2.0.x] Add EXTRA_FAN_SPEED feature
This commit is contained in:
commit
02f2979760
|
@ -825,6 +825,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -165,6 +165,10 @@ bool axis_homed[XYZ] = { false }, axis_known_position[XYZ] = { false };
|
||||||
|
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
int16_t fanSpeeds[FAN_COUNT] = { 0 };
|
int16_t fanSpeeds[FAN_COUNT] = { 0 };
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEEDS)
|
||||||
|
int16_t old_fanSpeeds[FAN_COUNT],
|
||||||
|
new_fanSpeeds[FAN_COUNT];
|
||||||
|
#endif
|
||||||
#if ENABLED(PROBING_FANS_OFF)
|
#if ENABLED(PROBING_FANS_OFF)
|
||||||
bool fans_paused = false;
|
bool fans_paused = false;
|
||||||
int16_t paused_fanSpeeds[FAN_COUNT] = { 0 };
|
int16_t paused_fanSpeeds[FAN_COUNT] = { 0 };
|
||||||
|
|
|
@ -198,6 +198,10 @@ extern millis_t max_inactive_time, stepper_inactive_time;
|
||||||
|
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
extern int16_t fanSpeeds[FAN_COUNT];
|
extern int16_t fanSpeeds[FAN_COUNT];
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEEDS)
|
||||||
|
extern int16_t old_fanSpeeds[FAN_COUNT],
|
||||||
|
new_fanSpeeds[FAN_COUNT];
|
||||||
|
#endif
|
||||||
#if ENABLED(PROBING_FANS_OFF)
|
#if ENABLED(PROBING_FANS_OFF)
|
||||||
extern bool fans_paused;
|
extern bool fans_paused;
|
||||||
extern int16_t paused_fanSpeeds[FAN_COUNT];
|
extern int16_t paused_fanSpeeds[FAN_COUNT];
|
||||||
|
|
|
@ -825,6 +825,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -821,6 +821,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -821,6 +821,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -845,6 +845,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -813,6 +813,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -834,6 +834,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -826,6 +826,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -826,6 +826,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -826,6 +826,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -826,6 +826,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -831,6 +831,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -826,6 +826,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -824,6 +824,15 @@
|
||||||
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
#define RETRACT_RECOVER_FEEDRATE_SWAP 8 // Default feedrate for recovering from swap retraction (mm/s)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extra Fan Speed
|
||||||
|
* Adds a secondary fan speed for each print-cooling fan.
|
||||||
|
* 'M106 P<fan> T3-255' : Set a secondary speed for <fan>
|
||||||
|
* 'M106 P<fan> T2' : Use the set secondary speed
|
||||||
|
* 'M106 P<fan> T1' : Restore the previous fan speed
|
||||||
|
*/
|
||||||
|
//#define EXTRA_FAN_SPEED
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Advanced Pause
|
* Advanced Pause
|
||||||
* Experimental feature for filament change support and for parking the nozzle when paused.
|
* Experimental feature for filament change support and for parking the nozzle when paused.
|
||||||
|
|
|
@ -113,8 +113,8 @@
|
||||||
* M100 - Watch Free Memory (for debugging) (Requires M100_FREE_MEMORY_WATCHER)
|
* M100 - Watch Free Memory (for debugging) (Requires M100_FREE_MEMORY_WATCHER)
|
||||||
* M104 - Set extruder target temp.
|
* M104 - Set extruder target temp.
|
||||||
* M105 - Report current temperatures.
|
* M105 - Report current temperatures.
|
||||||
* M106 - Fan on.
|
* M106 - Set print fan speed.
|
||||||
* M107 - Fan off.
|
* M107 - Print fan off.
|
||||||
* M108 - Break out of heating loops (M109, M190, M303). With no controller, breaks out of M0/M1. (Requires EMERGENCY_PARSER)
|
* M108 - Break out of heating loops (M109, M190, M303). With no controller, breaks out of M0/M1. (Requires EMERGENCY_PARSER)
|
||||||
* M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating
|
* M109 - Sxxx Wait for extruder current temp to reach target temp. Waits only when heating
|
||||||
* Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling
|
* Rxxx Wait for extruder current temp to reach target temp. Waits when heating and cooling
|
||||||
|
|
|
@ -32,12 +32,39 @@
|
||||||
*
|
*
|
||||||
* S<int> Speed between 0-255
|
* S<int> Speed between 0-255
|
||||||
* P<index> Fan index, if more than one fan
|
* P<index> Fan index, if more than one fan
|
||||||
|
*
|
||||||
|
* With EXTRA_FAN_SPEED enabled:
|
||||||
|
*
|
||||||
|
* T<int> Restore/Use/Set Temporary Speed:
|
||||||
|
* 1 = Restore previous speed after T2
|
||||||
|
* 2 = Use temporary speed set with T3-255
|
||||||
|
* 3-255 = Set the speed for use with T2
|
||||||
*/
|
*/
|
||||||
void GcodeSuite::M106() {
|
void GcodeSuite::M106() {
|
||||||
uint16_t s = parser.ushortval('S', 255);
|
const uint8_t p = parser.byteval('P');
|
||||||
NOMORE(s, 255);
|
if (p < FAN_COUNT) {
|
||||||
const uint8_t p = parser.byteval('P', 0);
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
if (p < FAN_COUNT) fanSpeeds[p] = s;
|
const int16_t t = parser.intval('T');
|
||||||
|
NOMORE(t, 255);
|
||||||
|
if (t > 0) {
|
||||||
|
switch (t) {
|
||||||
|
case 1:
|
||||||
|
fanSpeeds[p] = old_fanSpeeds[p];
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
old_fanSpeeds[p] = fanSpeeds[p];
|
||||||
|
fanSpeeds[p] = new_fanSpeeds[p];
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
new_fanSpeeds[p] = t;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif // EXTRA_FAN_SPEED
|
||||||
|
const uint16_t s = parser.ushortval('S', 255);
|
||||||
|
fanSpeeds[p] = min(s, 255);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -398,6 +398,9 @@
|
||||||
#ifndef MSG_FAN_SPEED
|
#ifndef MSG_FAN_SPEED
|
||||||
#define MSG_FAN_SPEED _UxGT("Fan speed")
|
#define MSG_FAN_SPEED _UxGT("Fan speed")
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef MSG_EXTRA_FAN_SPEED
|
||||||
|
#define MSG_EXTRA_FAN_SPEED _UxGT("Extra fan speed")
|
||||||
|
#endif
|
||||||
#ifndef MSG_FLOW
|
#ifndef MSG_FLOW
|
||||||
#define MSG_FLOW _UxGT("Flow")
|
#define MSG_FLOW _UxGT("Flow")
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1238,6 +1238,15 @@ void kill_screen(const char* lcd_msg) {
|
||||||
|
|
||||||
#endif // ADVANCED_PAUSE_FEATURE
|
#endif // ADVANCED_PAUSE_FEATURE
|
||||||
|
|
||||||
|
// First Fan Speed title in "Tune" and "Control>Temperature" menus
|
||||||
|
#if FAN_COUNT > 0 && HAS_FAN0
|
||||||
|
#if FAN_COUNT > 1
|
||||||
|
#define FAN_SPEED_1_SUFFIX " 1"
|
||||||
|
#else
|
||||||
|
#define FAN_SPEED_1_SUFFIX ""
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* "Tune" submenu
|
* "Tune" submenu
|
||||||
|
@ -1293,18 +1302,22 @@ void kill_screen(const char* lcd_msg) {
|
||||||
//
|
//
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
#if FAN_COUNT > 1
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED FAN_SPEED_1_SUFFIX, &fanSpeeds[0], 0, 255);
|
||||||
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
#else
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED FAN_SPEED_1_SUFFIX, &new_fanSpeeds[0], 3, 255);
|
||||||
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
|
|
||||||
#endif
|
#endif
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
|
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN1
|
#if HAS_FAN1
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 2", &new_fanSpeeds[1], 3, 255);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN2
|
#if HAS_FAN2
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 3", &new_fanSpeeds[2], 3, 255);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif // FAN_COUNT > 0
|
#endif // FAN_COUNT > 0
|
||||||
|
|
||||||
|
@ -3305,18 +3318,22 @@ void kill_screen(const char* lcd_msg) {
|
||||||
//
|
//
|
||||||
#if FAN_COUNT > 0
|
#if FAN_COUNT > 0
|
||||||
#if HAS_FAN0
|
#if HAS_FAN0
|
||||||
#if FAN_COUNT > 1
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED FAN_SPEED_1_SUFFIX, &fanSpeeds[0], 0, 255);
|
||||||
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED " 1"
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
#else
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED FAN_SPEED_1_SUFFIX, &new_fanSpeeds[0], 3, 255);
|
||||||
#define MSG_1ST_FAN_SPEED MSG_FAN_SPEED
|
|
||||||
#endif
|
#endif
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_1ST_FAN_SPEED, &fanSpeeds[0], 0, 255);
|
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN1
|
#if HAS_FAN1
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 2", &fanSpeeds[1], 0, 255);
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 2", &new_fanSpeeds[1], 3, 255);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if HAS_FAN2
|
#if HAS_FAN2
|
||||||
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED " 3", &fanSpeeds[2], 0, 255);
|
||||||
|
#if ENABLED(EXTRA_FAN_SPEED)
|
||||||
|
MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_EXTRA_FAN_SPEED " 3", &new_fanSpeeds[2], 3, 255);
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#endif // FAN_COUNT > 0
|
#endif // FAN_COUNT > 0
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue