From 2d68d707f68bd339a44fd2d52f330908ec479f14 Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Fri, 29 Jan 2016 16:19:38 -0800
Subject: [PATCH] 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             |  1 -
 src/ili9341/ili9341.h         |  3 +--
 src/ili9341/javaupm_ili9341.i | 28 ++++++++++++++++++++++++++++
 src/ili9341/pyupm_ili9341.i   |  1 +
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/ili9341/javaupm_ili9341.i

diff --git a/src/ili9341/gfx.h b/src/ili9341/gfx.h
index 3cbc5a12..c62e81e4 100644
--- a/src/ili9341/gfx.h
+++ b/src/ili9341/gfx.h
@@ -32,7 +32,6 @@
 
 namespace upm 
 {
-
     /**
      * @brief GFX helper class
      */
diff --git a/src/ili9341/ili9341.h b/src/ili9341/ili9341.h
index fb2d341b..fbf8a204 100644
--- a/src/ili9341/ili9341.h
+++ b/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
diff --git a/src/ili9341/javaupm_ili9341.i b/src/ili9341/javaupm_ili9341.i
new file mode 100644
index 00000000..d725498f
--- /dev/null
+++ b/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);
+        }
+    }
+%}
\ No newline at end of file
diff --git a/src/ili9341/pyupm_ili9341.i b/src/ili9341/pyupm_ili9341.i
index d8cb1d74..c7728537 100644
--- a/src/ili9341/pyupm_ili9341.i
+++ b/src/ili9341/pyupm_ili9341.i
@@ -4,6 +4,7 @@
 %include "../upm.i"
 
 %feature("autodoc", "3");
+%rename("printString") print(std::string msg);
 
 %include "gfx.h"
 %{