Embedded Artists / Mbed OS DMSupport

A board support package for the LPC4088 Display Module.

Dependencies:   DM_HttpServer DM_USBHost

Dependents:   lpc4088_displaymodule_emwin lpc4088_displaymodule_demo_sphere sampleGUI sampleEmptyGUI ... more

Fork of DMSupport by EmbeddedArtists AB

Files at this revision

API Documentation at this revision

Revision 36:92193dc72995, committed 2015-03-20

Comitter:
alindvall
Date:
Fri Mar 20 14:44:06 2015 +0000
Parent:
35:d45a38606a7f
Child:
37:07659b5d90ce
Commit message:
Modified DMBoard interface to always have the touchPanel() and display() functions even if the touch/display has been disabled in dm_board_config.h to allow e.g. AppTouchCalibration to compile (even if it will never be used it must still compile)

Changed in this revision

DMBoard.cpp Show annotated file Show diff for this revision Revisions of this file
DMBoard.h Show annotated file Show diff for this revision Revisions of this file 
--- a/DMBoard.cpp	Fri Mar 20 13:36:00 2015 +0000
+++ b/DMBoard.cpp	Fri Mar 20 14:44:06 2015 +0000
@@ -199,19 +199,21 @@
   return _button.read() == 0;
 }
 
+TouchPanel* DMBoard::touchPanel()
+{
 #if defined(DM_BOARD_USE_TOUCH)
-  TouchPanel* DMBoard::touchPanel()
-  {
-    if (BiosTouch::instance().isTouchSupported()) {
-      return &BiosTouch::instance();
-    }
-    return NULL;
+  if (BiosTouch::instance().isTouchSupported()) {
+    return &BiosTouch::instance();
   }
 #endif
+  return NULL;
+}
 
+Display* DMBoard::display()
+{
 #if defined(DM_BOARD_USE_DISPLAY)
-  Display* DMBoard::display()
-  {
-    return &BiosDisplay::instance();
-  }
+  return &BiosDisplay::instance();
+#else
+  return NULL;
 #endif
+}

--- a/DMBoard.h	Fri Mar 20 13:36:00 2015 +0000
+++ b/DMBoard.h	Fri Mar 20 14:44:06 2015 +0000
@@ -30,10 +30,8 @@
 #elif defined(DM_BOARD_USE_QSPI)
   #include "SPIFI.h"
 #endif
-#if defined(DM_BOARD_USE_DISPLAY)
-  #include "Display.h"
-  #include "TouchPanel.h"
-#endif
+#include "Display.h"
+#include "TouchPanel.h"
 #if defined(DM_BOARD_USE_REGISTRY)
   #include "Registry.h"
 #endif
@@ -121,7 +119,6 @@
      */
     bool buttonPressed();
     
-#if defined(DM_BOARD_USE_DISPLAY)
     /** Returns the TouchPanel interface
      *
      *  @returns
@@ -136,7 +133,6 @@
      */
     Display* display();
 
-#endif
     /** Returns the logger interface
      *
      *  @returns