diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-09 01:59:18 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-09 01:59:18 +0000 |
commit | 5e2515ed3229eaf608fe5135db2d473694bf600f (patch) | |
tree | 83f64b3c041565cb33be609874a092a8f4c9c1e0 /nuttx/drivers | |
parent | 14f4f5c4cb34f594624263cd10ccaba7137f83fe (diff) | |
download | px4-nuttx-5e2515ed3229eaf608fe5135db2d473694bf600f.tar.gz px4-nuttx-5e2515ed3229eaf608fe5135db2d473694bf600f.tar.bz2 px4-nuttx-5e2515ed3229eaf608fe5135db2d473694bf600f.zip |
Fix LCD fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3167 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rwxr-xr-x | nuttx/drivers/lcd/nokia6100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/drivers/lcd/nokia6100.c b/nuttx/drivers/lcd/nokia6100.c index 36e92007c..008fd297b 100755 --- a/nuttx/drivers/lcd/nokia6100.c +++ b/nuttx/drivers/lcd/nokia6100.c @@ -474,7 +474,7 @@ static struct nokia_dev_s g_lcddev = * P4: 0: Dispersion P40= 1: Non-dispersion */ -#if CONFIG_NOKIA6100_BPP == 12 +#if 1 // CONFIG_NOKIA6100_BPP == 12 static const uint8_t g_disctl[] = { S1D15G10_DISCTL, /* Display control */ @@ -543,9 +543,9 @@ static const uint8_t g_datctl[] = 0, /* RGB->RGB */ #endif #if CONFIG_NOKIA6100_BPP == 8 - DATCTL_16GRAY_A /* Selects 16-bit color, Type A */ -#elif CONFIG_NOKIA6100_BPP == 12 DATCTL_8GRAY /* Selects 8-bit color */ +#elif CONFIG_NOKIA6100_BPP == 12 + DATCTL_16GRAY_A /* Selects 16-bit color, Type A */ #else # error "16-bit mode not yet implemented" #endif |