ili9341: added java bindings plus minor fix on python wrap and GFX class collision

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

src/ili9341/gfx.h

@@ -32,7 +32,6 @@
 
 namespace upm 
 {
-
     /**
      * @brief GFX helper class
      */

src/ili9341/ili9341.h

@@ -32,7 +32,7 @@
 #include <mraa/common.hpp>
 #include <mraa/gpio.hpp>
 #include <mraa/spi.hpp>
-#include <gfx.h>
+#include "gfx.h"
 
 // Defines
 #define ILI9341_TFTWIDTH    240
@@ -128,7 +128,6 @@
 #define ILI9341_PINK        0xF81F
 
 namespace upm {
-
     /**
      * @brief ILI9341 LCD library
      * @defgroup ili9341 libupm-ili9341

src/ili9341/javaupm_ili9341.i

@@ -0,0 +1,28 @@
+%module javaupm_ili9341
+%include "../upm.i"
+%include "stdint.i"
+%include "typemaps.i"
+
+%apply uint8_t *INPUT { uint8_t *addr }
+
+%include "gfx.h"
+%{
+    #include "gfx.h"
+%}
+
+%{
+    #include "ili9341.h"
+%}
+
+%include "ili9341.h"
+
+%pragma(java) jniclasscode=%{
+    static {
+        try {
+            System.loadLibrary("javaupm_ili9341");
+        } catch (UnsatisfiedLinkError e) {
+            System.err.println("Native code library failed to load. \n" + e);
+            System.exit(1);
+        }
+    }
+%}

src/ili9341/pyupm_ili9341.i

@@ -4,6 +4,7 @@
 %include "../upm.i"
 
 %feature("autodoc", "3");
+%rename("printString") print(std::string msg);
 
 %include "gfx.h"
 %{