Skip to content

Commit

Permalink
Revert frequency changes
Browse files Browse the repository at this point in the history
Needs more investigation. Suspended for now.
  • Loading branch information
davidramiro committed Apr 3, 2019
1 parent 2b4c936 commit b18052c
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,9 @@
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it

// i3 Mega stock v5 hotend, 40W heater cartridge (3.6Ω @ 22°C)
#define DEFAULT_Kp 18.58
#define DEFAULT_Ki 1.38
#define DEFAULT_Kd 62.40
#define DEFAULT_Kp 15.94
#define DEFAULT_Ki 1.17
#define DEFAULT_Kd 54.19

// Ultimaker
//#define DEFAULT_Kp 22.2
Expand Down Expand Up @@ -437,9 +437,9 @@
//#define PID_BED_DEBUG // Sends debug data to the serial port.

//Anycubic i3 Mega Ultrabase (0.9Ω @ 22°C)
#define DEFAULT_bedKp 187.45
#define DEFAULT_bedKi 35.75
#define DEFAULT_bedKd 245.71
#define DEFAULT_bedKp 251.78
#define DEFAULT_bedKi 49.57
#define DEFAULT_bedKd 319.73

//120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune
Expand Down Expand Up @@ -1834,13 +1834,13 @@
// Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
// which is not as annoying as with the hardware PWM. On the other hand, if this frequency
// is too low, you should also increment SOFT_PWM_SCALE.
#define FAN_SOFT_PWM
//#define FAN_SOFT_PWM

// Incrementing this by 1 will double the software PWM frequency,
// 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.
#define SOFT_PWM_SCALE 2
#define SOFT_PWM_SCALE 0

// If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
// be used to mitigate the associated resolution loss. If enabled,
Expand Down

0 comments on commit b18052c

Please sign in to comment.