From 029dffba32f14333250ab26ff6be2641b3b70279 Mon Sep 17 00:00:00 2001 From: Stefan Olsson Date: Thu, 21 Sep 2017 20:09:45 +0200 Subject: [PATCH] resolve conflict --- library/display.dcm | 64 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/library/display.dcm b/library/display.dcm index 4bed59f0..69759c0c 100644 --- a/library/display.dcm +++ b/library/display.dcm @@ -159,15 +159,9 @@ K BAR DOT F Display/HDSP-48xx.pdf $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 -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 +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 F http://www.lcd-module.com/fileadmin/eng/pdf/doma/dogs104e.pdf $ENDCMP # @@ -177,6 +171,36 @@ K Graphic display EA DOGXL160-7 F http://www.lcd-module.com/eng/pdf/grafik/dogxl160-7e.pdf $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 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 @@ -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 $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 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