diff --git a/src/ili9341/CMakeLists.txt b/src/ili9341/CMakeLists.txt index 6998826b..8420d01f 100644 --- a/src/ili9341/CMakeLists.txt +++ b/src/ili9341/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ili9341") set (libdescription "libupm ILI9341 SPI LCD") -set (module_src gfx.cxx ili9341.cxx) -set (module_h gfx.h ili9341.h) +set (module_src ili9341_gfx.cxx ili9341.cxx) +set (module_h ili9341_gfx.h ili9341.h) upm_module_init() diff --git a/src/ili9341/ili9341.h b/src/ili9341/ili9341.h index fbf8a204..35727416 100644 --- a/src/ili9341/ili9341.h +++ b/src/ili9341/ili9341.h @@ -32,7 +32,7 @@ #include #include #include -#include "gfx.h" +#include "ili9341_gfx.h" // Defines #define ILI9341_TFTWIDTH 240 diff --git a/src/ili9341/gfx.cxx b/src/ili9341/ili9341_gfx.cxx similarity index 99% rename from src/ili9341/gfx.cxx rename to src/ili9341/ili9341_gfx.cxx index 90f83dec..7ddab468 100644 --- a/src/ili9341/gfx.cxx +++ b/src/ili9341/ili9341_gfx.cxx @@ -24,7 +24,7 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "gfx.h" +#include "ili9341_gfx.h" using namespace upm; diff --git a/src/ili9341/gfx.h b/src/ili9341/ili9341_gfx.h similarity index 100% rename from src/ili9341/gfx.h rename to src/ili9341/ili9341_gfx.h diff --git a/src/ili9341/javaupm_ili9341.i b/src/ili9341/javaupm_ili9341.i index d725498f..731ed82a 100644 --- a/src/ili9341/javaupm_ili9341.i +++ b/src/ili9341/javaupm_ili9341.i @@ -5,9 +5,9 @@ %apply uint8_t *INPUT { uint8_t *addr } -%include "gfx.h" +%include "ili9341_gfx.h" %{ - #include "gfx.h" + #include "ili9341_gfx.h" %} %{ diff --git a/src/ili9341/jsupm_ili9341.i b/src/ili9341/jsupm_ili9341.i index db58074c..c6d8f02d 100644 --- a/src/ili9341/jsupm_ili9341.i +++ b/src/ili9341/jsupm_ili9341.i @@ -1,9 +1,9 @@ %module jsupm_ili9341 %include "../upm.i" -%include "gfx.h" +%include "ili9341_gfx.h" %{ - #include "gfx.h" + #include "ili9341_gfx.h" %} %include "ili9341.h" diff --git a/src/ili9341/pyupm_ili9341.i b/src/ili9341/pyupm_ili9341.i index c7728537..ee71226a 100644 --- a/src/ili9341/pyupm_ili9341.i +++ b/src/ili9341/pyupm_ili9341.i @@ -6,9 +6,9 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "gfx.h" +%include "ili9341_gfx.h" %{ - #include "gfx.h" + #include "ili9341_gfx.h" %} %include "ili9341.h" diff --git a/src/ssd1351/CMakeLists.txt b/src/ssd1351/CMakeLists.txt index ee75b73a..3d277bfb 100644 --- a/src/ssd1351/CMakeLists.txt +++ b/src/ssd1351/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "ssd1351") set (libdescription "libupm SSD1351 SPI LCD") -set (module_src gfx.cxx ssd1351.cxx) -set (module_h gfx.h ssd1351.h) +set (module_src ssd1351_gfx.cxx ssd1351.cxx) +set (module_h ssd1351_gfx.h ssd1351.h) upm_module_init() diff --git a/src/ssd1351/javaupm_ssd1351.i b/src/ssd1351/javaupm_ssd1351.i index 7adb59a7..a33b842c 100644 --- a/src/ssd1351/javaupm_ssd1351.i +++ b/src/ssd1351/javaupm_ssd1351.i @@ -6,9 +6,9 @@ %ignore m_map; %ignore font; -%include "gfx.h" +%include "ssd1351_gfx.h" %{ - #include "gfx.h" + #include "ssd1351_gfx.h" %} %include "ssd1351.h" diff --git a/src/ssd1351/jsupm_ssd1351.i b/src/ssd1351/jsupm_ssd1351.i index b0961519..01934af4 100644 --- a/src/ssd1351/jsupm_ssd1351.i +++ b/src/ssd1351/jsupm_ssd1351.i @@ -1,9 +1,9 @@ %module jsupm_ssd1351 %include "../upm.i" -%include "gfx.h" +%include "ssd1351_gfx.h" %{ - #include "gfx.h" + #include "ssd1351_gfx.h" %} %include "ssd1351.h" diff --git a/src/ssd1351/pyupm_ssd1351.i b/src/ssd1351/pyupm_ssd1351.i index fee480d2..9c3dbef7 100644 --- a/src/ssd1351/pyupm_ssd1351.i +++ b/src/ssd1351/pyupm_ssd1351.i @@ -6,9 +6,9 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "gfx.h" +%include "ssd1351_gfx.h" %{ - #include "gfx.h" + #include "ssd1351_gfx.h" %} %include "ssd1351.h" diff --git a/src/ssd1351/ssd1351.h b/src/ssd1351/ssd1351.h index 5a37352e..9a1a514e 100644 --- a/src/ssd1351/ssd1351.h +++ b/src/ssd1351/ssd1351.h @@ -30,7 +30,7 @@ #include #include #include -#include "gfx.h" +#include "ssd1351_gfx.h" // Display Size #define SSD1351WIDTH 128 diff --git a/src/ssd1351/gfx.cxx b/src/ssd1351/ssd1351_gfx.cxx similarity index 99% rename from src/ssd1351/gfx.cxx rename to src/ssd1351/ssd1351_gfx.cxx index 443932e0..55f0f6ee 100644 --- a/src/ssd1351/gfx.cxx +++ b/src/ssd1351/ssd1351_gfx.cxx @@ -28,7 +28,7 @@ #include #include -#include "gfx.h" +#include "ssd1351_gfx.h" using namespace upm; diff --git a/src/ssd1351/gfx.h b/src/ssd1351/ssd1351_gfx.h similarity index 100% rename from src/ssd1351/gfx.h rename to src/ssd1351/ssd1351_gfx.h diff --git a/src/st7735/CMakeLists.txt b/src/st7735/CMakeLists.txt index f3b3a373..3434e178 100644 --- a/src/st7735/CMakeLists.txt +++ b/src/st7735/CMakeLists.txt @@ -1,5 +1,5 @@ set (libname "st7735") set (libdescription "libupm SPI LCD") -set (module_src gfx.cxx st7735.cxx) -set (module_h gfx.h st7735.h) +set (module_src st7735_gfx.cxx st7735.cxx) +set (module_h st7735_gfx.h st7735.h) upm_module_init() diff --git a/src/st7735/javaupm_st7735.i b/src/st7735/javaupm_st7735.i index e60367c9..c73a46ca 100644 --- a/src/st7735/javaupm_st7735.i +++ b/src/st7735/javaupm_st7735.i @@ -35,9 +35,9 @@ $1 = (unsigned char *)JCALL2(GetByteArrayElements, jenv, $input, NULL); } -%include "gfx.h" +%include "st7735_gfx.h" %{ - #include "gfx.h" + #include "st7735_gfx.h" %} %include "st7735.h" diff --git a/src/st7735/jsupm_st7735.i b/src/st7735/jsupm_st7735.i index ea3809b7..cf00008d 100644 --- a/src/st7735/jsupm_st7735.i +++ b/src/st7735/jsupm_st7735.i @@ -1,9 +1,9 @@ %module jsupm_st7735 %include "../upm.i" -%include "gfx.h" +%include "st7735_gfx.h" %{ - #include "gfx.h" + #include "st7735_gfx.h" %} %include "st7735.h" diff --git a/src/st7735/pyupm_st7735.i b/src/st7735/pyupm_st7735.i index f1d416e6..e18f83d4 100644 --- a/src/st7735/pyupm_st7735.i +++ b/src/st7735/pyupm_st7735.i @@ -6,9 +6,9 @@ %feature("autodoc", "3"); %rename("printString") print(std::string msg); -%include "gfx.h" +%include "st7735_gfx.h" %{ - #include "gfx.h" + #include "st7735_gfx.h" %} %include "st7735.h" diff --git a/src/st7735/st7735.h b/src/st7735/st7735.h index 5f9b9027..7180ee2c 100644 --- a/src/st7735/st7735.h +++ b/src/st7735/st7735.h @@ -33,7 +33,7 @@ #include #include -#include "gfx.h" +#include "st7735_gfx.h" #define INITR_GREENTAB 0x0 #define INITR_REDTAB 0x1 diff --git a/src/st7735/gfx.cxx b/src/st7735/st7735_gfx.cxx similarity index 99% rename from src/st7735/gfx.cxx rename to src/st7735/st7735_gfx.cxx index 80cd2dbf..df53cb15 100644 --- a/src/st7735/gfx.cxx +++ b/src/st7735/st7735_gfx.cxx @@ -26,7 +26,7 @@ #include #include -#include "gfx.h" +#include "st7735_gfx.h" using namespace upm; diff --git a/src/st7735/gfx.h b/src/st7735/st7735_gfx.h similarity index 100% rename from src/st7735/gfx.h rename to src/st7735/st7735_gfx.h