Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

This commit is contained in:
Bob-the-Kuhn
2019-04-25 12:06:01 -05:00
154 changed files with 1156 additions and 525 deletions

View File

@ -2041,6 +2041,7 @@
// affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
// However, control resolution will be halved for each increment;
// at zero value, there are 128 effective control positions.
// :[0,1,2,3,4,5,6,7]
#define SOFT_PWM_SCALE 0
// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
@ -2152,3 +2153,9 @@
// Allow servo angle to be edited and saved to EEPROM
//#define EDITABLE_SERVO_ANGLES
#ifdef ROXYs_TRex
#define LED_PIN -1
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif