From c3c605c6582443231022c0f29aaa56e04e6a548d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 8 Jul 2015 21:33:12 -0700 Subject: [PATCH] Move note about LiquidTWI2 to Configuration.h (PR#2406) --- Marlin/Conditionals.h | 5 ----- Marlin/Configuration.h | 6 ++++++ Marlin/configurator/config/Configuration.h | 6 ++++++ Marlin/example_configurations/Felix/Configuration.h | 6 ++++++ Marlin/example_configurations/Felix/Configuration_DUAL.h | 6 ++++++ Marlin/example_configurations/Hephestos/Configuration.h | 6 ++++++ Marlin/example_configurations/K8200/Configuration.h | 6 ++++++ .../RepRapWorld/Megatronics/Configuration.h | 6 ++++++ Marlin/example_configurations/SCARA/Configuration.h | 6 ++++++ Marlin/example_configurations/WITBOX/Configuration.h | 6 ++++++ .../example_configurations/adafruit/ST7565/Configuration.h | 6 ++++++ Marlin/example_configurations/delta/biv2.5/Configuration.h | 6 ++++++ Marlin/example_configurations/delta/generic/Configuration.h | 6 ++++++ .../delta/kossel_mini/Configuration.h | 6 ++++++ .../example_configurations/delta/kossel_pro/Configuration.h | 6 ++++++ Marlin/example_configurations/makibox/Configuration.h | 6 ++++++ Marlin/example_configurations/tvrrug/Round2/Configuration.h | 6 ++++++ 17 files changed, 96 insertions(+), 5 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 4a852dd22..3582170a6 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -90,11 +90,6 @@ // PANELOLU2 LCD with status LEDs, separate encoder and click inputs #ifdef LCD_I2C_PANELOLU2 - // 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_TYPE_MCP23017 #define LCD_I2C_ADDRESS 0x20 // I2C Address of the port expander #define LCD_USE_I2C_BUZZER //comment out to disable buzzer on LCD diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 47b2b91d0..85865226a 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -704,6 +704,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 diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index ecadfa17c..497aac9f6 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/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 diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index 9c4b5308d..2fc31d0f0 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -687,6 +687,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 diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index 00cb64aa2..d75109ac1 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -641,6 +641,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 diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index b1f6f9a7a..951c39a1d 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -712,6 +712,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // 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 diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 964097aa7..abcc7e5e0 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -720,6 +720,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 diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index e89f94b0d..95596b5be 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -704,6 +704,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 diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 5d1bf57eb..01d7f2613 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -745,6 +745,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 diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 8fa07b067..a29de2601 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -712,6 +712,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // 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 diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index ed8d8811d..35b2128c7 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/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 diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 51047a61c..a6a3859a6 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -831,6 +831,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // 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 diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 98dfcb7e0..bde2a9ddb 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -831,6 +831,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // 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 diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index 79b5baeb4..1fcc93db7 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -835,6 +835,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 diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index b500e621d..902f9c24a 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -858,6 +858,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 diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 48c3fbc6a..55024f477 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -707,6 +707,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 diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index 6ba1d2d1a..ec89f8105 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -713,6 +713,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // 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