# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1520964914 0
# Node ID fd1d9063ad409bbd40fffaa6065a03fa92bf5b6d
# Parent  395e464e4005ee0ca8afeaa59bcc84478e13cb1b
config mechanism: added ability to build D-Sample B&W UI configuration

diff -r 395e464e4005 -r fd1d9063ad40 components/bmi
--- a/components/bmi	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/bmi	Tue Mar 13 18:15:14 2018 +0000
@@ -22,7 +22,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/bmi-tcs3
--- a/components/bmi-tcs3	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/bmi-tcs3	Tue Mar 13 18:15:14 2018 +0000
@@ -22,7 +22,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/gdi
--- a/components/gdi	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/gdi	Tue Mar 13 18:15:14 2018 +0000
@@ -44,7 +44,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/icn
--- a/components/icn	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/icn	Tue Mar 13 18:15:14 2018 +0000
@@ -19,7 +19,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/icn-tcs3
--- a/components/icn-tcs3	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/icn-tcs3	Tue Mar 13 18:15:14 2018 +0000
@@ -19,7 +19,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/mfw
--- a/components/mfw	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/mfw	Tue Mar 13 18:15:14 2018 +0000
@@ -54,7 +54,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 components/mfw-tcs3
--- a/components/mfw-tcs3	Mon Mar 05 04:01:30 2018 +0000
+++ b/components/mfw-tcs3	Tue Mar 13 18:15:14 2018 +0000
@@ -54,7 +54,10 @@
 
 if [ "$TARGET" != c139 -a "$TARGET" != c11x ]
 then
-	CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	if [ "$DSAMPLE_FULL_COLOR" = 1 ]
+	then
+		CPPFLAGS="$CPPFLAGS -DCOLOURDISPLAY"
+	fi
 	CPPFLAGS="$CPPFLAGS -DLSCREEN"
 fi
 
diff -r 395e464e4005 -r fd1d9063ad40 configure.sh
--- a/configure.sh	Mon Mar 05 04:01:30 2018 +0000
+++ b/configure.sh	Tue Mar 13 18:15:14 2018 +0000
@@ -88,6 +88,7 @@
 
 # configurable feature settings
 
+DSAMPLE_FULL_COLOR=1
 SERIAL_DYNAMIC_SWITCH=0
 
 # allow the user to override these defaults
@@ -192,6 +193,7 @@
 export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO
 export DISABLE_SLEEP
 export INIT_blob
+export DSAMPLE_FULL_COLOR
 export SERIAL_DYNAMIC_SWITCH
 
 SUBDIR=
diff -r 395e464e4005 -r fd1d9063ad40 scripts/cfg-template
--- a/scripts/cfg-template	Mon Mar 05 04:01:30 2018 +0000
+++ b/scripts/cfg-template	Tue Mar 13 18:15:14 2018 +0000
@@ -1,6 +1,7 @@
 [board.cfg]
 
 BOARD 41
+DSAMPLE_FULL_COLOR var
 
 [chipset.cfg]
 
diff -r 395e464e4005 -r fd1d9063ad40 scripts/config-headers-new.sh
--- a/scripts/config-headers-new.sh	Mon Mar 05 04:01:30 2018 +0000
+++ b/scripts/config-headers-new.sh	Tue Mar 13 18:15:14 2018 +0000
@@ -112,6 +112,12 @@
 fi
 export R2D_STATE
 
+if [ -z "$DSAMPLE_FULL_COLOR" ]
+then
+	DSAMPLE_FULL_COLOR=1
+fi
+export DSAMPLE_FULL_COLOR
+
 # Derived settings only for the generation of *.cfg headers
 
 case "$RF" in
diff -r 395e464e4005 -r fd1d9063ad40 src/cs/drivers/drv_app/r2d/r2d_config.h
--- a/src/cs/drivers/drv_app/r2d/r2d_config.h	Mon Mar 05 04:01:30 2018 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_config.h	Tue Mar 13 18:15:14 2018 +0000
@@ -91,7 +91,7 @@
 	#define R2D_REFRESH_PERIOD 40 // ms
 	#define R2D_EMBEDDED_LCD R2D_MIRRORED_LCD 
     #elif ((BOARD == 40) || (BOARD == 41) || (BOARD == 42) || (BOARD == 43))
-       #if (!GSMLITE)
+       #if DSAMPLE_FULL_COLOR
          // D-Sample Board with Color Display
 	 #define R2D_REFRESH_PERIOD 40 // ms
 	 #define R2D_EMBEDDED_LCD R2D_BOARD_DSAMPLE