From 0947c5ba502e9625ddfe7be043320ecece03d449 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sat, 28 May 2016 21:07:13 +0200 Subject: [PATCH] Configtool: learn about DISPLAY_TYPE_HD44780. This replaces DISPLAY_TYPE_LCD1302, because LCD1302 has no actual implementation, yet. --- config/board.3drag.h | 4 ++-- config/board.cnc-shield-v3.h | 4 ++-- config/board.gen3.h | 4 ++-- config/board.gen6.h | 4 ++-- config/board.gen7-arm.h | 4 ++-- config/board.gen7-v1.1-v1.3.h | 4 ++-- config/board.gen7-v1.4.h | 4 ++-- config/board.melzi.h | 4 ++-- config/board.nanoheart-v1.0.h | 4 ++-- config/board.ramps-v1.2.h | 4 ++-- config/board.ramps-v1.3.h | 4 ++-- config/board.rumba.h | 4 ++-- config/board.sanguinololu-v1.1.h | 4 ++-- config/board.sanguinololu-v1.2.h | 4 ++-- config/board.sanguish.h | 4 ++-- config/board.sinaptec-at328-02.h | 4 ++-- config/board.teensy++-v2.0.h | 4 ++-- config/board.teensy-v2.0.h | 4 ++-- config/board.tronxy.h | 4 ++-- configtool/board.generic.h | 4 ++-- configtool/displaypage.py | 6 +++--- display.h | 4 ++-- testcases/config.h.Profiling | 4 ++-- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/config/board.3drag.h b/config/board.3drag.h index 96c0dea..864255f 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -296,7 +296,7 @@ DEFINE_HEATER(fan, DIO8, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(fan, DIO8, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.cnc-shield-v3.h b/config/board.cnc-shield-v3.h index 81ffd89..7a304e2 100644 --- a/config/board.cnc-shield-v3.h +++ b/config/board.cnc-shield-v3.h @@ -292,7 +292,7 @@ DEFINE_HEATER(extruder, AIO2, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -301,4 +301,4 @@ DEFINE_HEATER(extruder, AIO2, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.gen3.h b/config/board.gen3.h index 64de15d..75c1897 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -284,7 +284,7 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -293,4 +293,4 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.gen6.h b/config/board.gen6.h index a9c9a91..8d9990f 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -287,7 +287,7 @@ DEFINE_HEATER(extruder, DIO6, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -296,4 +296,4 @@ DEFINE_HEATER(extruder, DIO6, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.gen7-arm.h b/config/board.gen7-arm.h index 156df32..6d34a27 100644 --- a/config/board.gen7-arm.h +++ b/config/board.gen7-arm.h @@ -302,7 +302,7 @@ DEFINE_HEATER(bed, PIO1_9, 1, 10) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -311,4 +311,4 @@ DEFINE_HEATER(bed, PIO1_9, 1, 10) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 9ceadb5..72733f7 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -298,7 +298,7 @@ DEFINE_HEATER(bed, DIO3, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -307,4 +307,4 @@ DEFINE_HEATER(bed, DIO3, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index e14a822..bb2eb93 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -299,7 +299,7 @@ DEFINE_HEATER(bed, DIO3, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -308,4 +308,4 @@ DEFINE_HEATER(bed, DIO3, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.melzi.h b/config/board.melzi.h index 529db12..325795d 100644 --- a/config/board.melzi.h +++ b/config/board.melzi.h @@ -300,7 +300,7 @@ DEFINE_HEATER(fan, DIO4, 0, 0) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -309,4 +309,4 @@ DEFINE_HEATER(fan, DIO4, 0, 0) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.nanoheart-v1.0.h b/config/board.nanoheart-v1.0.h index dcb70a3..d85e204 100644 --- a/config/board.nanoheart-v1.0.h +++ b/config/board.nanoheart-v1.0.h @@ -296,7 +296,7 @@ DEFINE_HEATER(bed, DIO3, 0, 1) #define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(bed, DIO3, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ #define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index 1138900..7580bdf 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -297,7 +297,7 @@ DEFINE_HEATER(fan, DIO9, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -306,4 +306,4 @@ DEFINE_HEATER(fan, DIO9, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index 3b88b1f..b71058a 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -302,7 +302,7 @@ DEFINE_HEATER(fan, DIO9, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -311,4 +311,4 @@ DEFINE_HEATER(fan, DIO9, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.rumba.h b/config/board.rumba.h index 48d3aec..7a725fa 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -300,7 +300,7 @@ DEFINE_HEATER(fan, DIO8, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -309,4 +309,4 @@ DEFINE_HEATER(fan, DIO8, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index b8eb162..33fed09 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -296,7 +296,7 @@ DEFINE_HEATER(bed, DIO14, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(bed, DIO14, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index 3c308ac..ddadf6c 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -296,7 +296,7 @@ DEFINE_HEATER(bed, DIO13, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(bed, DIO13, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.sanguish.h b/config/board.sanguish.h index 6a4766d..4e2b345 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -296,7 +296,7 @@ DEFINE_HEATER(bed, DIO4, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(bed, DIO4, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.sinaptec-at328-02.h b/config/board.sinaptec-at328-02.h index 09a0a44..ee72b3b 100644 --- a/config/board.sinaptec-at328-02.h +++ b/config/board.sinaptec-at328-02.h @@ -299,7 +299,7 @@ DEFINE_HEATER(fan, DIO5, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -308,4 +308,4 @@ DEFINE_HEATER(fan, DIO5, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index a58fe2b..b7b3034 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -296,7 +296,7 @@ DEFINE_HEATER(fan, DIO16, 0, 0) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(fan, DIO16, 0, 0) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index a705a9e..ad09eee 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -296,7 +296,7 @@ DEFINE_HEATER(fan, DIO8, 0, 0) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -305,4 +305,4 @@ DEFINE_HEATER(fan, DIO8, 0, 0) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/config/board.tronxy.h b/config/board.tronxy.h index c4284e1..6c866c0 100644 --- a/config/board.tronxy.h +++ b/config/board.tronxy.h @@ -298,7 +298,7 @@ DEFINE_HEATER(fan, DIO4, 0, 1) //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -307,4 +307,4 @@ DEFINE_HEATER(fan, DIO4, 0, 1) display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780 diff --git a/configtool/board.generic.h b/configtool/board.generic.h index c4e7d2c..6b619b5 100644 --- a/configtool/board.generic.h +++ b/configtool/board.generic.h @@ -284,7 +284,7 @@ #define DISPLAY_BUS_I2C #define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -293,4 +293,4 @@ display, comment out all of DISPLAY_BUS_xxx. */ #define DISPLAY_TYPE_SSD1306 -#define DISPLAY_TYPE_LCD1302 +#define DISPLAY_TYPE_HD44780 diff --git a/configtool/displaypage.py b/configtool/displaypage.py index 56b9826..0f49a9a 100644 --- a/configtool/displaypage.py +++ b/configtool/displaypage.py @@ -17,8 +17,8 @@ class DisplayPage(wx.Panel, Page): 'DISPLAY_BUS_8BIT': "Direct with 8 pins", 'DISPLAY_BUS_I2C': "I²C ( = TWI)", 'DISPLAY_BUS_SPI': "SPI", - 'DISPLAY_TYPE_SSD1306': "SSD1306 O-LED, 128x32", - 'DISPLAY_TYPE_LCD1302': "LCD 1302"} + 'DISPLAY_TYPE_SSD1306': "SSD1306 O-LED, 128x32 pixels", + 'DISPLAY_TYPE_HD44780': "HD44780 or 1602A, 16x2 characters"} sz = wx.GridBagSizer() sz.AddSpacer((20, 40), pos = (0, 0)) @@ -29,7 +29,7 @@ class DisplayPage(wx.Panel, Page): sz.AddSpacer((100, 10), pos = (1, 2)) ch = self.addBoolChoice('DISPLAY_TYPE', False, 100, self.onChoice, - size = (200, -1)) + size = (240, -1)) sz.Add(ch, pos = (1, 3)) self.SetSizer(sz) diff --git a/display.h b/display.h index fbbc4fa..9a07491 100644 --- a/display.h +++ b/display.h @@ -30,9 +30,9 @@ #define DISPLAY - #elif defined DISPLAY_TYPE_LCD1302 + #else - #error Display type LCD1302 not yet supported. + #error Display type not yet supported. #endif /* DISPLAY_TYPE_... */ diff --git a/testcases/config.h.Profiling b/testcases/config.h.Profiling index 72a6bd1..5aecff8 100644 --- a/testcases/config.h.Profiling +++ b/testcases/config.h.Profiling @@ -687,7 +687,7 @@ PWM value for 'off' //#define DISPLAY_BUS_I2C //#define DISPLAY_BUS_SPI -/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_LCD1302 +/** \def DISPLAY_TYPE_SSD1306 DISPLAY_TYPE_HD44780 The type of display in use. There can be only one choice. Taken into account only if one of DISPLAY_BUS_xxx is defined. @@ -696,7 +696,7 @@ PWM value for 'off' display, comment out all of DISPLAY_BUS_xxx. */ //#define DISPLAY_TYPE_SSD1306 -//#define DISPLAY_TYPE_LCD1302 +//#define DISPLAY_TYPE_HD44780