--- a/src/cs/drivers/drv_app/r2d/r2d_refresh.c	Sat Oct 17 10:04:54 2020 +0000
+++ b/src/cs/drivers/drv_app/r2d/r2d_refresh.c	Sat Oct 17 19:45:18 2020 +0000
@@ -65,55 +65,12 @@
 	rvf_unlock_mutex(r2d_g_global_mutex);
 }
 
-#if (R2D_EMBEDDED_LCD == R2D_PC_COLOR_LCD)
-#include "lcds/ColorPC/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_PC_CSAMPLE)
-#include "lcds/PC_CSAMPLE/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_PC_DSAMPLE)
-#include "lcds/PC_DSAMPLE/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_SIMPLE_LCD) 
-#include "lcds/Simple/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_MIRRORED_LCD) 
-  #ifdef CONFIG_TARGET_C139
-    #include "lcds/c139/r2d_task_i.c"
-  #else
-    #include "lcds/Simple/r2d_task_i.c"
-  #endif
-#endif
+/* FreeCalypso Tourmaline: totally new approach */
 
-#if (R2D_EMBEDDED_LCD == R2D_CUSTOMER_LCD) 
-#include "lcds/Customer/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_HORIZONTAL_LCD) 
-#include "lcds/Horizontal/r2d_task_i.c"
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_COLOR_LCD) 
-#include "lcds/ColorBoard/r2d_task_i.c"
+#if defined(CONFIG_TARGET_LUNA) && (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE)
+  #include "lcds/luna/r2d_task_i.c"
+#elif defined(CONFIG_TARGET_LUNA) && (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE)
+  #include "lcds/luna/r2d_task_i_bw.c"
+#else
+  #error "R2D refresh selection: unsupported combination"
 #endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "lcds/luna/r2d_task_i.c"
-  #else
-    #include "lcds/D_Sample/r2d_task_i.c"
-  #endif
-#endif
-
-#if (R2D_EMBEDDED_LCD == R2D_BOARD_BW_DSAMPLE)
-  #ifdef CONFIG_TARGET_LUNA
-    #include "lcds/luna/r2d_task_i_bw.c"
-  #else
-    #include "lcds/BW_D_Sample/r2d_task_i.c"
-  #endif
-#endif
-