andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge PR #2118

pull/1/head
Richard Wackerbarth 9 years ago
parent
5239a4e839 788eb6e647
commit
cf5d64d940
12 changed files with 64 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Marlin/Configuration_adv.h
  2. 5
      Marlin/example_configurations/Felix/Configuration_adv.h
  3. 5
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  4. 5
      Marlin/example_configurations/K8200/Configuration_adv.h
  5. 5
      Marlin/example_configurations/SCARA/Configuration_adv.h
  6. 5
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  7. 5
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  8. 5
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  9. 5
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  10. 5
      Marlin/example_configurations/makibox/Configuration_adv.h
  11. 5
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  12. 13
      Marlin/planner.cpp

5
Marlin/Configuration_adv.h
View File

@ -94,6 +94,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/Felix/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/Hephestos/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/K8200/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
#define FAN_MIN_PWM 50 // K8200: fan stops running at about 35 to 40 (of 255)
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/SCARA/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/WITBOX/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/delta/generic/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/makibox/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

5
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
View File

@ -102,6 +102,11 @@
// before setting a PWM value. (Does not work with software PWM for fan on Sanguinololu)
//#define FAN_KICKSTART_TIME 100
// This defines the minimal speed for the main fan, run in PWM mode
// to enable uncomment and set minimal PWM speed for reliable running (1-255)
// if fan speed is [1 - (FAN_MIN_PWM-1)] it is set to FAN_MIN_PWM
//#define FAN_MIN_PWM 50
// @section extruder
// Extruder cooling fans

13
Marlin/planner.cpp
View File

@ -440,12 +440,17 @@ void check_axes_activity() {
} else {
fan_kick_end = 0;
}
#endif//FAN_KICKSTART_TIME
#endif //FAN_KICKSTART_TIME
#ifdef FAN_MIN_PWM
#define CALC_FAN_SPEED (tail_fan_speed ? ( FAN_MIN_PWM + (tail_fan_speed * (255 - FAN_MIN_PWM)) / 255 ) : 0)
#else
#define CALC_FAN_SPEED tail_fan_speed
#endif // FAN_MIN_PWM
#ifdef FAN_SOFT_PWM
fanSpeedSoftPwm = tail_fan_speed;
fanSpeedSoftPwm = CALC_FAN_SPEED;
#else
analogWrite(FAN_PIN, tail_fan_speed);
#endif //!FAN_SOFT_PWM
analogWrite(FAN_PIN, CALC_FAN_SPEED);
#endif // FAN_SOFT_PWM
#endif // HAS_FAN
#ifdef AUTOTEMP

Write Preview
Loading…
Cancel
Save