FreeCalypso > hg > fc-tourmaline

changeset 6:b55b47f49638

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FC Tourmaline R2D_EMBEDDED_LCD config change
author Mychaela Falconia <falcon@freecalypso.org>
date Fri, 16 Oct 2020 06:49:33 +0000
parents 3bb135e72ac9
children d6f8d6efdf5b
files scripts/cfg-template src/cs/drivers/drv_app/r2d/r2d_config.h
diffstat 2 files changed, 4 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/cfg-template	Fri Oct 16 06:43:34 2020 +0000
+++ b/scripts/cfg-template	Fri Oct 16 06:49:33 2020 +0000
@@ -1,7 +1,6 @@
 [board.cfg]
 
 BOARD 41
-DSAMPLE_FULL_COLOR var
 
 [chipset.cfg]
 
@@ -50,6 +49,7 @@
 [r2d.cfg]
 
 R2D_ASM 0
+R2D_EMBEDDED_LCD var
 R2D_LCD_TEST 0
 
 [rf.cfg]
--- a/src/cs/drivers/drv_app/r2d/r2d_config.h	Fri Oct 16 06:43:34 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_config.h	Fri Oct 16 06:49:33 2020 +0000
@@ -81,26 +81,9 @@
        #define R2D_EMBEDDED_LCD R2D_PC_COLOR_LCD
 #endif
 
-#if (R2D_LCD_TEST == 1)
-    #define R2D_REFRESH_PERIOD 40 // ms
-    #define R2D_EMBEDDED_LCD R2D_BOARD_COLOR_LCD 
-#else
-    #if ((BOARD == 7) || (BOARD == 8) || (BOARD == 9))
-	// C-Sample is equipped with Mirrored LCD
-	#define R2D_REFRESH_PERIOD 40 // ms
-	#define R2D_EMBEDDED_LCD R2D_MIRRORED_LCD 
-    #elif ((BOARD == 40) || (BOARD == 41) || (BOARD == 42) || (BOARD == 43))
-       #if DSAMPLE_FULL_COLOR
-         // D-Sample Board with Color Display
-	 #define R2D_REFRESH_PERIOD 40 // ms
-	 #define R2D_EMBEDDED_LCD R2D_BOARD_DSAMPLE
-       #else
-         // D-Sample Board with simulated B&W Display
-         #define R2D_REFRESH_PERIOD 40 // ms
-         #define R2D_EMBEDDED_LCD R2D_BOARD_BW_DSAMPLE
-       #endif
-    #endif
-#endif
+/* FreeCalypso Tourmaline: R2D_EMBEDDED_LCD is set in r2d.cfg */
+
+#define R2D_REFRESH_PERIOD 40 // ms
 
 // Launch R2D_REFRESH_LOOP to estimate the time
 // taken by one loop