From 7d8c6b3f3c31e783eada6f2ac28da9f920233062 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 21 Feb 2018 00:46:25 -0600 Subject: [PATCH] Add 20x4 option for Sainsmart LCD (#9740) --- .travis.yml | 4 ++-- Marlin/Configuration.h | 7 ++++--- Marlin/src/config/default/Configuration.h | 7 ++++--- .../examples/AlephObjects/TAZ4/Configuration.h | 7 ++++--- .../examples/AliExpress/CL-260/Configuration.h | 7 ++++--- .../src/config/examples/Anet/A6/Configuration.h | 7 ++++--- .../src/config/examples/Anet/A8/Configuration.h | 7 ++++--- .../config/examples/Azteeg/X5GT/Configuration.h | 7 ++++--- .../examples/BIBO/TouchX/cyclops/Configuration.h | 7 ++++--- .../examples/BIBO/TouchX/default/Configuration.h | 7 ++++--- .../config/examples/BQ/Hephestos/Configuration.h | 7 ++++--- .../examples/BQ/Hephestos_2/Configuration.h | 7 ++++--- .../src/config/examples/BQ/WITBOX/Configuration.h | 7 ++++--- .../src/config/examples/Cartesio/Configuration.h | 7 ++++--- .../examples/Creality/CR-10/Configuration.h | 7 ++++--- .../examples/Creality/CR-10S/Configuration.h | 7 ++++--- .../examples/Creality/Ender/Configuration.h | 7 ++++--- Marlin/src/config/examples/Felix/Configuration.h | 7 ++++--- .../config/examples/Felix/DUAL/Configuration.h | 7 ++++--- .../examples/FolgerTech/i3-2020/Configuration.h | 7 ++++--- .../examples/Geeetech/GT2560/Configuration.h | 7 ++++--- .../Geeetech/I3_Pro_X-GT2560/Configuration.h | 7 ++++--- .../Prusa i3 Pro B/bltouch/Configuration.h | 7 ++++--- .../Prusa i3 Pro B/noprobe/Configuration.h | 7 ++++--- .../examples/Infitary/i3-M508/Configuration.h | 7 ++++--- .../config/examples/JGAurora/A5/Configuration.h | 7 ++++--- .../config/examples/MakerParts/Configuration.h | 7 ++++--- .../config/examples/Malyan/M150/Configuration.h | 7 ++++--- .../config/examples/Malyan/M200/Configuration.h | 7 ++++--- .../examples/Micromake/C1/basic/Configuration.h | 7 ++++--- .../Micromake/C1/enhanced/Configuration.h | 7 ++++--- .../src/config/examples/Mks/Sbase/Configuration.h | 7 ++++--- .../RepRapWorld/Megatronics/Configuration.h | 7 ++++--- .../src/config/examples/RigidBot/Configuration.h | 7 ++++--- Marlin/src/config/examples/SCARA/Configuration.h | 7 ++++--- .../src/config/examples/STM32F10/Configuration.h | 7 ++++--- .../config/examples/Sanguinololu/Configuration.h | 7 ++++--- .../src/config/examples/TheBorg/Configuration.h | 7 ++++--- .../src/config/examples/TinyBoy2/Configuration.h | 7 ++++--- .../src/config/examples/Tronxy/X1/Configuration.h | 7 ++++--- .../config/examples/Tronxy/X5S/Configuration.h | 7 ++++--- .../config/examples/Tronxy/XY100/Configuration.h | 7 ++++--- .../examples/UltiMachine/Archim2/Configuration.h | 7 ++++--- .../examples/Velleman/K8200/Configuration.h | 7 ++++--- .../examples/Velleman/K8400/Configuration.h | 7 ++++--- .../Velleman/K8400/Dual-head/Configuration.h | 7 ++++--- .../examples/Wanhao/Duplicator 6/Configuration.h | 7 ++++--- .../examples/adafruit/ST7565/Configuration.h | 7 ++++--- .../delta/FLSUN/auto_calibrate/Configuration.h | 7 ++++--- .../examples/delta/FLSUN/kossel/Configuration.h | 7 ++++--- .../delta/FLSUN/kossel_mini/Configuration.h | 7 ++++--- .../config/examples/delta/generic/Configuration.h | 7 ++++--- .../examples/delta/kossel_mini/Configuration.h | 7 ++++--- .../examples/delta/kossel_pro/Configuration.h | 7 ++++--- .../examples/delta/kossel_xl/Configuration.h | 7 ++++--- .../examples/gCreate/gMax1.5+/Configuration.h | 7 ++++--- .../src/config/examples/makibox/Configuration.h | 7 ++++--- .../config/examples/stm32f103ret6/Configuration.h | 7 ++++--- .../config/examples/tvrrug/Round2/Configuration.h | 7 ++++--- Marlin/src/config/examples/wt150/Configuration.h | 7 ++++--- Marlin/src/inc/Conditionals_LCD.h | 15 ++++++++------- Marlin/src/inc/SanityCheck.h | 7 ++++++- 62 files changed, 252 insertions(+), 187 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd0a767e3..7c7e71252 100644 --- a/.travis.yml +++ b/.travis.yml @@ -258,10 +258,10 @@ script: # Most I2C configurations are failing at the moment because they require # a different Liquid Crystal library "LiquidTWI2". # - # LCD_I2C_SAINSMART_YWROBOT + # LCD_SAINSMART_I2C_1602 # #- restore_configs - #- opt_enable LCD_I2C_SAINSMART_YWROBOT + #- opt_enable LCD_SAINSMART_I2C_1602 #- build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM} # # LCD_I2C_PANELOLU2 diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index d84508183..a84512251 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h index d84508183..a84512251 100644 --- a/Marlin/src/config/default/Configuration.h +++ b/Marlin/src/config/default/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h index 259bc9b0a..24404c855 100644 --- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h +++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h @@ -1620,12 +1620,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h index b12a37b31..59f42da89 100644 --- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h +++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h index 6f30b0880..e5875112d 100644 --- a/Marlin/src/config/examples/Anet/A6/Configuration.h +++ b/Marlin/src/config/examples/Anet/A6/Configuration.h @@ -1750,12 +1750,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h index eee53cb82..b5b779f2a 100644 --- a/Marlin/src/config/examples/Anet/A8/Configuration.h +++ b/Marlin/src/config/examples/Anet/A8/Configuration.h @@ -1609,12 +1609,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h index 683b9d36d..f0f67de4c 100644 --- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h +++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h index 862f4bf75..aff691977 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h @@ -1600,12 +1600,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h index 6e294fee9..de9283396 100644 --- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h +++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h @@ -1600,12 +1600,13 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h index 5c73cc64f..9a86568a6 100644 --- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h @@ -1588,12 +1588,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h index 6763927e0..dfee5c6f4 100644 --- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h +++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h @@ -1601,12 +1601,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h index 96b9354cf..1a386a8b4 100644 --- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h +++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h @@ -1588,12 +1588,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h index 0f6165307..58eacfddd 100644 --- a/Marlin/src/config/examples/Cartesio/Configuration.h +++ b/Marlin/src/config/examples/Cartesio/Configuration.h @@ -1599,12 +1599,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h index 9e0ea51b9..3a9834faf 100755 --- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h @@ -1611,12 +1611,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h index 1e67d5336..5b5885370 100644 --- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h +++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h @@ -1586,12 +1586,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Creality/Ender/Configuration.h b/Marlin/src/config/examples/Creality/Ender/Configuration.h index 21e905523..9cda5a521 100644 --- a/Marlin/src/config/examples/Creality/Ender/Configuration.h +++ b/Marlin/src/config/examples/Creality/Ender/Configuration.h @@ -1586,12 +1586,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h index 982cf1048..b46051d34 100644 --- a/Marlin/src/config/examples/Felix/Configuration.h +++ b/Marlin/src/config/examples/Felix/Configuration.h @@ -1582,12 +1582,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h index 6d272b102..4434d5b09 100644 --- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h +++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h @@ -1582,12 +1582,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h index 07b7ff6dc..e9f7718eb 100644 --- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h +++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h @@ -1606,12 +1606,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h index 3bd3a447c..f9fc66e2d 100644 --- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h @@ -1615,12 +1615,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h index 336f593cf..aa3e1608f 100644 --- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h index 4610eed81..d9521fe21 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h @@ -1604,12 +1604,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h index fa9981a81..49065f85b 100644 --- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h +++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h @@ -1603,12 +1603,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h index 94f2b58d5..9ad2cefbb 100644 --- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h +++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h @@ -1604,12 +1604,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h index 9e901321d..1abc4f83b 100644 --- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h +++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h @@ -1611,12 +1611,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h index a109d92c1..4887deace 100644 --- a/Marlin/src/config/examples/MakerParts/Configuration.h +++ b/Marlin/src/config/examples/MakerParts/Configuration.h @@ -1620,12 +1620,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h index cc42b84e8..b85ecbea1 100644 --- a/Marlin/src/config/examples/Malyan/M150/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h @@ -1628,12 +1628,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h index 162ec96db..b676c2b1a 100644 --- a/Marlin/src/config/examples/Malyan/M200/Configuration.h +++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h @@ -1599,12 +1599,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h index c053009c0..de59235b2 100644 --- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h @@ -1604,12 +1604,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h index e9212fcf0..452b42ea7 100644 --- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h +++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h @@ -1604,12 +1604,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index b4c2a674c..ae8ffda0c 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -1602,12 +1602,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h index b604f4761..348f4b82a 100644 --- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h index 7433cdc6e..4111793bc 100644 --- a/Marlin/src/config/examples/RigidBot/Configuration.h +++ b/Marlin/src/config/examples/RigidBot/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h index 1c5696ef2..fcc2e7b41 100644 --- a/Marlin/src/config/examples/SCARA/Configuration.h +++ b/Marlin/src/config/examples/SCARA/Configuration.h @@ -1612,12 +1612,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h index 4dd22ef97..4617dcee2 100644 --- a/Marlin/src/config/examples/STM32F10/Configuration.h +++ b/Marlin/src/config/examples/STM32F10/Configuration.h @@ -1603,12 +1603,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h index f1dc4b6cb..538c60074 100644 --- a/Marlin/src/config/examples/Sanguinololu/Configuration.h +++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h @@ -1631,12 +1631,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h index 613ebb7db..833715b1d 100644 --- a/Marlin/src/config/examples/TheBorg/Configuration.h +++ b/Marlin/src/config/examples/TheBorg/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h index 07f0998a7..77f2437ed 100644 --- a/Marlin/src/config/examples/TinyBoy2/Configuration.h +++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h @@ -1656,12 +1656,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h index 139920e9e..fe494ae70 100644 --- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h @@ -1585,12 +1585,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h index f4e989c21..465d717ab 100644 --- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h index 07e893afb..dee561d48 100644 --- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h +++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h @@ -1611,12 +1611,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h index 9a69b5783..286baaf57 100644 --- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h +++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h @@ -1591,12 +1591,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h index 59826b14e..5984775eb 100644 --- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h @@ -1633,12 +1633,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h index 266273d6c..a6303c8d7 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h index 57296c67a..fb7a34cf5 100644 --- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h +++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h @@ -1594,12 +1594,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h index fa61ffa65..2c900678f 100644 --- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h +++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h @@ -1541,12 +1541,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h index 728d776bc..6338967a3 100644 --- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h +++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h @@ -1600,12 +1600,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h index 393c2981b..26ee3f825 100644 --- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h @@ -1734,12 +1734,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h index 9765f9c3c..a15e88575 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h @@ -1719,12 +1719,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h index b663e7f01..1a9ab7101 100644 --- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h @@ -1732,12 +1732,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h index 71ed4b458..d10edb276 100644 --- a/Marlin/src/config/examples/delta/generic/Configuration.h +++ b/Marlin/src/config/examples/delta/generic/Configuration.h @@ -1721,12 +1721,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h index 7c89f6ff1..537ee791b 100644 --- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h @@ -1724,12 +1724,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h index df704315a..865505eb5 100644 --- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h @@ -1724,12 +1724,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h index b5d5c8214..dd9ff1c65 100644 --- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h +++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h @@ -1733,12 +1733,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h index 9254aaaae..ce18c8ab9 100644 --- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h +++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h @@ -1614,12 +1614,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h index d48b62bd1..c6242369a 100644 --- a/Marlin/src/config/examples/makibox/Configuration.h +++ b/Marlin/src/config/examples/makibox/Configuration.h @@ -1603,12 +1603,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h index cbca3d83e..f89b6b002 100644 --- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h +++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h @@ -1601,12 +1601,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h index 8324590d5..ac058e2d2 100644 --- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h +++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h @@ -1595,12 +1595,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h index 8db6c63c4..7c433eaed 100644 --- a/Marlin/src/config/examples/wt150/Configuration.h +++ b/Marlin/src/config/examples/wt150/Configuration.h @@ -1605,12 +1605,13 @@ //#define RA_CONTROL_PANEL // -// Sainsmart YW Robot (LCM1602) LCD Display +// Sainsmart (YwRobot) LCD Displays // -// Note: This controller requires F.Malpartida's LiquidCrystal_I2C library +// These require F.Malpartida's LiquidCrystal_I2C library // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home // -//#define LCD_I2C_SAINSMART_YWROBOT +//#define LCD_SAINSMART_I2C_1602 +//#define LCD_SAINSMART_I2C_2004 // // Generic LCM1602 LCD adapter diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h index 5cec44b00..6daff521b 100644 --- a/Marlin/src/inc/Conditionals_LCD.h +++ b/Marlin/src/inc/Conditionals_LCD.h @@ -205,14 +205,15 @@ * I2C PANELS */ -#if ENABLED(LCD_I2C_SAINSMART_YWROBOT) - - // Note: This controller requires F.Malpartida's LiquidCrystal_I2C library - // https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home +#if ENABLED(LCD_SAINSMART_I2C_1602) || ENABLED(LCD_SAINSMART_I2C_2004) #define LCD_I2C_TYPE_PCF8575 #define LCD_I2C_ADDRESS 0x27 // I2C Address of the port expander - #define ULTIPANEL + + #if ENABLED(LCD_SAINSMART_I2C_2004) + #define LCD_WIDTH 20 + #define LCD_HEIGHT 4 + #endif #elif ENABLED(LCD_I2C_PANELOLU2) @@ -220,7 +221,7 @@ #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 + #define LCD_USE_I2C_BUZZER // Enable buzzer on LCD (optional) #define ULTIPANEL #elif ENABLED(LCD_I2C_VIKI) @@ -235,7 +236,7 @@ */ #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 (requires LiquidTWI2 v1.2.3 or later) + #define LCD_USE_I2C_BUZZER // Enable buzzer on LCD (requires LiquidTWI2 v1.2.3 or later) #define ULTIPANEL #define ENCODER_FEEDRATE_DEADZONE 4 diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index ea78be3ce..e90c88c0a 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -241,6 +241,8 @@ #error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING. Please update your configuration." #elif defined(ANET_KEYPAD_LCD) #error "ANET_KEYPAD_LCD is now ZONESTAR_LCD. Please update your configuration." +#elif defined(LCD_I2C_SAINSMART_YWROBOT) + #error "LCD_I2C_SAINSMART_YWROBOT is now LCD_SAINSMART_I2C_(1602|2004). Please update your configuration." #elif defined(MEASURED_LOWER_LIMIT) || defined(MEASURED_UPPER_LIMIT) #error "MEASURED_(UPPER|LOWER)_LIMIT is now FILWIDTH_ERROR_MARGIN. Please update your configuration." #elif defined(AUTOMATIC_CURRENT_CONTROL) @@ -1447,7 +1449,10 @@ static_assert(1 >= 0 #if ENABLED(RA_CONTROL_PANEL) + 1 #endif - #if ENABLED(LCD_I2C_SAINSMART_YWROBOT) + #if ENABLED(LCD_SAINSMART_I2C_1602) + + 1 + #endif + #if ENABLED(LCD_SAINSMART_I2C_2004) + 1 #endif #if ENABLED(LCM1602)