tztz/KicadLib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

resolve conflict

Browse source
This commit is contained in:
Stefan Olsson 2017-09-21 20:09:45 +02:00
parent 2599ae81b6
commit 029dffba32
1 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
library/display.dcm
View file

@ -159,15 +159,9 @@ K BAR DOT
F Display/HDSP-48xx.pdf F Display/HDSP-48xx.pdf
$ENDCMP $ENDCMP
# #
$CMP EA_T123X-I2C
D 3 Lines, 12 character alpha numeric LCD, transreflective STN and FSTN Gray, I2C, single or dual power
K 3 Lines, 12 character alpha numeric LCD, transreflective STN and FSTN Gray, I2C, single or dual power
F http://www.lcd-module.de/pdf/doma/t123-i2c.pdf
$ENDCMP
#
$CMP EA_DOGS104B-A $CMP EA_DOGS104B-A
D LCD 4x10 character display blue transmissive background, +3.3V VDD, I2C or SPI D LCD 4x10 character display blue transmissive background, +3.3V VDD, I2C or SPI
K LCD 4x10 character display blue transmissive background, +3.3V VDD, I2C or SPI K LCD 4x10 character display blue transmissive background, +3.3V VDD, I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/doma/dogs104e.pdf F http://www.lcd-module.com/fileadmin/eng/pdf/doma/dogs104e.pdf
$ENDCMP $ENDCMP
# #
@ -177,6 +171,36 @@ K Graphic display EA DOGXL160-7
F http://www.lcd-module.com/eng/pdf/grafik/dogxl160-7e.pdf F http://www.lcd-module.com/eng/pdf/grafik/dogxl160-7e.pdf
$ENDCMP $ENDCMP
# #
$CMP EA_T123X-I2C
D 3 Lines, 12 character alpha numeric LCD, transreflective STN and FSTN Gray, I2C, single or dual power
K 3 Lines, 12 character alpha numeric LCD, transreflective STN and FSTN Gray, I2C, single or dual power
F http://www.lcd-module.de/pdf/doma/t123-i2c.pdf
$ENDCMP
#
$CMP EA_eDIP128B-6LW
D LCD-graphical display with LED backlight blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128B-6LWTP
D LCD-graphical display with LED backlight and touch panel blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight and touch panel blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128W-6LW
D LCD-graphical display with LED backlight positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128W-6LWTP
D LCD-graphical display with LED backlight and touch panel positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight and touch panel positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP320B-8LW $CMP EA_eDIP320B-8LW
D LCD graphical display 320x240 white LED backlight blue negative, +5V VDD, RS-232, I2C or SPI D LCD graphical display 320x240 white LED backlight blue negative, +5V VDD, RS-232, I2C or SPI
K LCD graphical display 320x240 white LED backlight blue negative, +5V VDD, RS-232, I2C or SPI K LCD graphical display 320x240 white LED backlight blue negative, +5V VDD, RS-232, I2C or SPI
@ -213,30 +237,6 @@ K LCD graphical display 320x240 white LED backlight with touch panel blue positi
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip320-8e.pdf F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip320-8e.pdf
$ENDCMP $ENDCMP
# #
$CMP EA_eDIP128B-6LW
D LCD-graphical display with LED backlight blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128B-6LWTP
D LCD-graphical display with LED backlight and touch panel blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight and touch panel blue negative, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128W-6LW
D LCD-graphical display with LED backlight positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIP128W-6LWTP
D LCD-graphical display with LED backlight and touch panel positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
K LCD-graphical display with LED backlight and touch panel positive mode FSTN, 3.3V - 5V VDD, RS-232. I2C or SPI
F http://www.lcd-module.com/fileadmin/eng/pdf/grafik/edip128-6e.pdf
$ENDCMP
#
$CMP EA_eDIPTFT43-A $CMP EA_eDIPTFT43-A
D TFT graphical display, 480x272, 16 bit colour, LED backlight, 5V VDD, RS-232, I2C or SPI D TFT graphical display, 480x272, 16 bit colour, LED backlight, 5V VDD, RS-232, I2C or SPI
K TFT graphical display, 480x272, 16 bit colour, LED backlight, 5V VDD, RS-232, I2C or SPI K TFT graphical display, 480x272, 16 bit colour, LED backlight, 5V VDD, RS-232, I2C or SPI