josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configtool: learn about DISPLAY_TYPE_HD44780. 

This replaces DISPLAY_TYPE_LCD1302, because LCD1302 has no
actual implementation, yet.
This commit is contained in:
Markus Hitter 2016-05-28 21:07:13 +02:00
parent 692fab68b9
commit 0947c5ba50
23 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/board.3drag.h
View File

@ -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

4
config/board.cnc-shield-v3.h
View File

@ -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

4
config/board.gen3.h
View File

@ -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

4
config/board.gen6.h
View File

@ -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

4
config/board.gen7-arm.h
View File

@ -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

4
config/board.gen7-v1.1-v1.3.h
View File

@ -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

4
config/board.gen7-v1.4.h
View File

@ -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

4
config/board.melzi.h
View File

@ -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

4
config/board.nanoheart-v1.0.h
View File

@ -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

4
config/board.ramps-v1.2.h
View File

@ -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

4
config/board.ramps-v1.3.h
View File

@ -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

4
config/board.rumba.h
View File

@ -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

4
config/board.sanguinololu-v1.1.h
View File

@ -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

4
config/board.sanguinololu-v1.2.h
View File

@ -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

4
config/board.sanguish.h
View File

@ -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

4
config/board.sinaptec-at328-02.h
View File

@ -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

4
config/board.teensy++-v2.0.h
View File

@ -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

4
config/board.teensy-v2.0.h
View File

@ -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

4
config/board.tronxy.h
View File

@ -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

4
configtool/board.generic.h
View File

@ -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

6
configtool/displaypage.py
View File

@ -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)

4
display.h
View File

@ -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_... */

4
testcases/config.h.Profiling
View File

@ -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