alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

lcm1602/jhd1313m1: temporarily rename headers to avoid duplicates

Browse Source 
This should be reverted when these 2 classes are removed from the i2clcd library. Will also require updating all the examples to load the new modules instead.

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2017-02-07 15:30:21 -08:00
parent 762c28f000
commit 70bcdfefa4
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jhd1313m1/CMakeLists.txt
View File

@ -2,7 +2,7 @@ upm_mixed_module_init (NAME jhd1313m1
DESCRIPTION "LCD Display Driver for the JHD1313M1 Controller for HD44780-based Displays" DESCRIPTION "LCD Display Driver for the JHD1313M1 Controller for HD44780-based Displays"
C_HDR jhd1313m1.h C_HDR jhd1313m1.h
C_SRC jhd1313m1.c C_SRC jhd1313m1.c
CPP_HDR jhd1313m1.hpp CPP_HDR jhd1313m1.hxx
CPP_SRC jhd1313m1.cxx CPP_SRC jhd1313m1.cxx
# FTI_SRC jhd1313m1_fti.c # FTI_SRC jhd1313m1_fti.c
CPP_WRAPS_C CPP_WRAPS_C

4
src/jhd1313m1/javaupm_jhd1313m1.i
View File

@ -23,9 +23,9 @@
} }
%include "jhd1313m1.h" %include "jhd1313m1.h"
%include "jhd1313m1.hpp" %include "jhd1313m1.hxx"
%{ %{
#include "jhd1313m1.hpp" #include "jhd1313m1.hxx"
%} %}
%pragma(java) jniclasscode=%{ %pragma(java) jniclasscode=%{

2
src/jhd1313m1/jhd1313m1.cxx
View File

@ -35,7 +35,7 @@
#include <stdexcept> #include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include "jhd1313m1.hpp" #include "jhd1313m1.hxx"
using namespace upm; using namespace upm;

0
src/jhd1313m1/jhd1313m1.hpp → src/jhd1313m1/jhd1313m1.hxx
View File

4
src/jhd1313m1/jsupm_jhd1313m1.i
View File

@ -3,7 +3,7 @@
%include "../carrays_uint8_t.i" %include "../carrays_uint8_t.i"
%include "jhd1313m1.h" %include "jhd1313m1.h"
%include "jhd1313m1.hpp" %include "jhd1313m1.hxx"
%{ %{
#include "jhd1313m1.hpp" #include "jhd1313m1.hxx"
%} %}

4
src/jhd1313m1/pyupm_jhd1313m1.i
View File

@ -7,7 +7,7 @@
%feature("autodoc", "3"); %feature("autodoc", "3");
%include "jhd1313m1.h" %include "jhd1313m1.h"
%include "jhd1313m1.hpp" %include "jhd1313m1.hxx"
%{ %{
#include "jhd1313m1.hpp" #include "jhd1313m1.hxx"
%} %}

2
src/lcm1602/CMakeLists.txt
View File

@ -2,7 +2,7 @@ upm_mixed_module_init (NAME lcm1602
DESCRIPTION "LCD Display Driver for the LCM1602 Controller for HD44780-based Displays" DESCRIPTION "LCD Display Driver for the LCM1602 Controller for HD44780-based Displays"
C_HDR lcm1602.h C_HDR lcm1602.h
C_SRC lcm1602.c C_SRC lcm1602.c
CPP_HDR lcm1602.hpp CPP_HDR lcm1602.hxx
CPP_SRC lcm1602.cxx CPP_SRC lcm1602.cxx
# FTI_SRC lcm1602_fti.c # FTI_SRC lcm1602_fti.c
CPP_WRAPS_C CPP_WRAPS_C

4
src/lcm1602/javaupm_lcm1602.i
View File

@ -23,10 +23,10 @@
} }
%include "lcm1602.h" %include "lcm1602.h"
%include "lcm1602.hpp" %include "lcm1602.hxx"
%{ %{
#include "lcm1602.hpp" #include "lcm1602.hxx"
%} %}
%pragma(java) jniclasscode=%{ %pragma(java) jniclasscode=%{

4
src/lcm1602/jsupm_lcm1602.i
View File

@ -3,7 +3,7 @@
%include "../carrays_uint8_t.i" %include "../carrays_uint8_t.i"
%include "lcm1602.h" %include "lcm1602.h"
%include "lcm1602.hpp" %include "lcm1602.hxx"
%{ %{
#include "lcm1602.hpp" #include "lcm1602.hxx"
%} %}

2
src/lcm1602/lcm1602.cxx
View File

@ -35,7 +35,7 @@
#include <stdexcept> #include <stdexcept>
#include <unistd.h> #include <unistd.h>
#include "lcm1602.hpp" #include "lcm1602.hxx"
using namespace upm; using namespace upm;

0
src/lcm1602/lcm1602.hpp → src/lcm1602/lcm1602.hxx
View File

4
src/lcm1602/pyupm_lcm1602.i
View File

@ -7,7 +7,7 @@
%feature("autodoc", "3"); %feature("autodoc", "3");
%include "lcm1602.h" %include "lcm1602.h"
%include "lcm1602.hpp" %include "lcm1602.hxx"
%{ %{
#include "lcm1602.hpp" #include "lcm1602.hxx"
%} %}