MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove some trailing whitespace

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-04 21:13:23 -06:00
parent eacb8346af
commit 081ab35e82
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/I2CPositionEncoder.cpp
View File

@ -180,7 +180,7 @@
errPrst[errPrstIdx++] = error; // Error must persist for I2CPE_ERR_PRST_ARRAY_SIZE error cycles. This also serves to improve the average accuracy errPrst[errPrstIdx++] = error; // Error must persist for I2CPE_ERR_PRST_ARRAY_SIZE error cycles. This also serves to improve the average accuracy
if (errPrstIdx >= I2CPE_ERR_PRST_ARRAY_SIZE) { if (errPrstIdx >= I2CPE_ERR_PRST_ARRAY_SIZE) {
float sumP = 0; float sumP = 0;
LOOP_L_N(i, I2CPE_ERR_PRST_ARRAY_SIZE) sumP += errPrst[i]; LOOP_L_N(i, I2CPE_ERR_PRST_ARRAY_SIZE) sumP += errPrst[i];
const int32_t errorP = int32_t(sumP * (1.0 / (I2CPE_ERR_PRST_ARRAY_SIZE))); const int32_t errorP = int32_t(sumP * (1.0 / (I2CPE_ERR_PRST_ARRAY_SIZE)));
SERIAL_ECHO(axis_codes[encoderAxis]); SERIAL_ECHO(axis_codes[encoderAxis]);
SERIAL_ECHOPAIR(" - err detected: ", errorP * planner.steps_to_mm[encoderAxis]); SERIAL_ECHOPAIR(" - err detected: ", errorP * planner.steps_to_mm[encoderAxis]);

2
Marlin/Marlin_main.cpp
View File

@ -3475,7 +3475,7 @@ inline void gcode_G4() {
*/ */
inline void gcode_G10() { inline void gcode_G10() {
#if EXTRUDERS > 1 #if EXTRUDERS > 1
const bool rs = parser.boolval('S'); const bool rs = parser.boolval('S');
#endif #endif
fwretract.retract(true fwretract.retract(true
#if EXTRUDERS > 1 #if EXTRUDERS > 1

10
Marlin/example_configurations/Creality/Ender-4/Configuration.h
View File

@ -416,17 +416,17 @@
#if ENABLED(PIDTEMPBED) #if ENABLED(PIDTEMPBED)
//#define PID_BED_DEBUG // Sends debug data to the serial port. //#define PID_BED_DEBUG // Sends debug data to the serial port.
//Ender-4 // Ender-4
#define DEFAULT_bedKp 426.68 #define DEFAULT_bedKp 426.68
#define DEFAULT_bedKi 78.92 #define DEFAULT_bedKi 78.92
#define DEFAULT_bedKd 576.71 #define DEFAULT_bedKd 576.71
//120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10) //from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
// #define DEFAULT_bedKp 10.00 //#define DEFAULT_bedKp 10.00
// #define DEFAULT_bedKi .023 //#define DEFAULT_bedKi .023
// #define DEFAULT_bedKd 305.4 //#define DEFAULT_bedKd 305.4
//120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune //from pidautotune

7
Marlin/example_configurations/delta/Hatchbox_Alpha/Configuration.h
View File

@ -388,7 +388,7 @@
//#define DEFAULT_Kp 63.0 //#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25 //#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440 //#define DEFAULT_Kd 440
// E3D-v6 // E3D-v6
#define DEFAULT_Kp 18.55 #define DEFAULT_Kp 18.55
#define DEFAULT_Ki 2.71 #define DEFAULT_Ki 2.71
@ -433,13 +433,12 @@
//#define DEFAULT_bedKp 97.1 //#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41 //#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16 //#define DEFAULT_bedKd 1675.16
//HatchBox Alpha //HatchBox Alpha
#define DEFAULT_bedKp 72.11 #define DEFAULT_bedKp 72.11
#define DEFAULT_bedKi 7.1 #define DEFAULT_bedKi 7.1
#define DEFAULT_bedKd 488.31 #define DEFAULT_bedKd 488.31
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED #endif // PIDTEMPBED