From 7456710a1f87a91e457fe8b9bd37f68e8c629411 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 15 Jul 2015 16:09:30 -0700 Subject: [PATCH] Update configs formatting --- Marlin/configurator/config/Configuration.h | 10 +++++----- Marlin/example_configurations/RigidBot/Configuration.h | 8 +++++++- Marlin/example_configurations/SCARA/Configuration.h | 2 +- .../adafruit/ST7565/Configuration.h | 10 +++++----- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index 424dd1995f..e4028295b0 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -250,19 +250,19 @@ Here are some standard links for getting your machine calibrated: #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term -//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) + //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) #define DEFAULT_bedKp 10.00 #define DEFAULT_bedKi .023 #define DEFAULT_bedKd 305.4 -//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) -//from pidautotune + //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from pidautotune //#define DEFAULT_bedKp 97.1 //#define DEFAULT_bedKi 1.41 //#define DEFAULT_bedKd 1675.16 -// 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 // @section extruder diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 05f3cd8b02..d2aa4cb2cc 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -703,6 +703,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic //#define LCD_I2C_SAINSMART_YWROBOT // PANELOLU2 LCD with status LEDs, separate encoder and click inputs +// +// This uses the LiquidTWI2 library v1.2.3 or later ( https://github.com/lincomatic/LiquidTWI2 ) +// Make sure the LiquidTWI2 directory is placed in the Arduino or Sketchbook libraries subdirectory. +// (v1.2.3 no longer requires you to define PANELOLU in the LiquidTWI2.h library header file) +// Note: The PANELOLU2 encoder click input can either be directly connected to a pin +// (if BTN_ENC defined to != -1) or read through I2C (when BTN_ENC == -1). //#define LCD_I2C_PANELOLU2 // Panucatt VIKI LCD with status LEDs, integrated click & L/R/U/P buttons, separate encoder inputs @@ -823,4 +829,4 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic #include "Configuration_adv.h" #include "thermistortables.h" -#endif //CONFIGURATION_H \ No newline at end of file +#endif //CONFIGURATION_H diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 650f195cdd..9996a71200 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -303,7 +303,7 @@ Here are some standard links for getting your machine calibrated: #define DEFAULT_bedKp 630.14 #define DEFAULT_bedKi 121.71 #define DEFAULT_bedKd 815.64 - + // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. #endif // PIDTEMPBED diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index 2c325f1c08..165a6bd101 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -250,19 +250,19 @@ Here are some standard links for getting your machine calibrated: #define PID_BED_INTEGRAL_DRIVE_MAX MAX_BED_POWER //limit for the integral term -//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) + //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) #define DEFAULT_bedKp 10.00 #define DEFAULT_bedKi .023 #define DEFAULT_bedKd 305.4 -//120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) -//from pidautotune + //120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) + //from pidautotune //#define DEFAULT_bedKp 97.1 //#define DEFAULT_bedKi 1.41 //#define DEFAULT_bedKd 1675.16 -// 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 // @section extruder