diff options
author | Hongmei Gou | 2017-07-24 10:43:27 -0500 |
---|---|---|
committer | Hongmei Gou | 2017-09-18 15:42:05 -0500 |
commit | dc9ab186d5144d83a17eee3181d2d8a362d44f7f (patch) | |
tree | feafe332511d22232273c86128e99a0dcd45fbdc | |
parent | 5b30dfbafe2050e5f6d74d1174e21efbce3943aa (diff) | |
download | cclink-dc9ab186d5144d83a17eee3181d2d8a362d44f7f.tar.gz cclink-dc9ab186d5144d83a17eee3181d2d8a362d44f7f.tar.xz cclink-dc9ab186d5144d83a17eee3181d2d8a362d44f7f.zip |
Ceated build/linux folder to host the linux Makefiles
* Also moved the parameter files to the sample folder and updated readme
Signed-off-by: Hongmei Gou <h-gou@ti.com>
-rw-r--r-- | CCIEF-BASIC_Master/Makefile | 17 | ||||
-rw-r--r-- | CCIEF-BASIC_Master/build/linux/Makefile | 17 | ||||
-rw-r--r-- | CCIEF-BASIC_Master/readme.txt | 10 | ||||
-rw-r--r-- | CCIEF-BASIC_Master/sample/MasterParameter.csv (renamed from CCIEF-BASIC_Master/MasterParameter.csv) | 0 | ||||
-rw-r--r-- | CCIEF-BASIC_Slave/Makefile | 17 | ||||
-rw-r--r-- | CCIEF-BASIC_Slave/build/linux/Makefile | 17 | ||||
-rw-r--r-- | CCIEF-BASIC_Slave/readme.txt | 10 | ||||
-rw-r--r-- | CCIEF-BASIC_Slave/sample/SlaveParameter.csv (renamed from CCIEF-BASIC_Slave/SlaveParameter.csv) | 0 |
8 files changed, 50 insertions, 38 deletions
diff --git a/CCIEF-BASIC_Master/Makefile b/CCIEF-BASIC_Master/Makefile deleted file mode 100644 index 70dbc03..0000000 --- a/CCIEF-BASIC_Master/Makefile +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Master_sample: SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o | ||
2 | gcc -o Master_sample SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o | ||
3 | |||
4 | SLMP.o: library/src/SLMP.c | ||
5 | gcc -I library/include -c library/src/SLMP.c | ||
6 | SOCKET.o: sample/src/SOCKET.c | ||
7 | gcc -I sample/include -c sample/src/SOCKET.c | ||
8 | TIMER.o: sample/src/TIMER.c | ||
9 | gcc -I sample/include -c sample/src/TIMER.c | ||
10 | CCIEF_BASIC_SLAVES.o: sample/src/CCIEF_BASIC_SLAVES.c | ||
11 | gcc -I sample/include -c sample/src/CCIEF_BASIC_SLAVES.c | ||
12 | CCIEF_BASIC_MASTER.o: sample/src/CCIEF_BASIC_MASTER.c | ||
13 | gcc -I sample/include -Ilibrary/include -c sample/src/CCIEF_BASIC_MASTER.c | ||
14 | USER_SAMPLE.o: sample/src/USER_SAMPLE.c | ||
15 | gcc -I sample/include -Ilibrary/include -c sample/src/USER_SAMPLE.c | ||
16 | clean: | ||
17 | rm SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o \ No newline at end of file | ||
diff --git a/CCIEF-BASIC_Master/build/linux/Makefile b/CCIEF-BASIC_Master/build/linux/Makefile new file mode 100644 index 0000000..c4f3fab --- /dev/null +++ b/CCIEF-BASIC_Master/build/linux/Makefile | |||
@@ -0,0 +1,17 @@ | |||
1 | Master_sample: SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o | ||
2 | $(CC) -o Master_sample SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o | ||
3 | |||
4 | SLMP.o: ../../library/src/SLMP.c | ||
5 | $(CC) -I ../../library/include -c ../../library/src/SLMP.c | ||
6 | SOCKET.o: ../../sample/src/SOCKET.c | ||
7 | $(CC) -I ../../sample/include -c ../../sample/src/SOCKET.c | ||
8 | TIMER.o: ../../sample/src/TIMER.c | ||
9 | $(CC) -I ../../sample/include -c ../../sample/src/TIMER.c | ||
10 | CCIEF_BASIC_SLAVES.o: ../../sample/src/CCIEF_BASIC_SLAVES.c | ||
11 | $(CC) -I ../../sample/include -c ../../sample/src/CCIEF_BASIC_SLAVES.c | ||
12 | CCIEF_BASIC_MASTER.o: ../../sample/src/CCIEF_BASIC_MASTER.c | ||
13 | $(CC) -I ../../sample/include -I ../../library/include -c ../../sample/src/CCIEF_BASIC_MASTER.c | ||
14 | USER_SAMPLE.o: ../../sample/src/USER_SAMPLE.c | ||
15 | $(CC) -I ../../sample/include -I ../../library/include -c ../../sample/src/USER_SAMPLE.c | ||
16 | clean: | ||
17 | rm SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVES.o CCIEF_BASIC_MASTER.o USER_SAMPLE.o Master_sample | ||
diff --git a/CCIEF-BASIC_Master/readme.txt b/CCIEF-BASIC_Master/readme.txt index 3e75d13..3c1f578 100644 --- a/CCIEF-BASIC_Master/readme.txt +++ b/CCIEF-BASIC_Master/readme.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | --------------------------------------------------------------------- | 1 | --------------------------------------------------------------------- |
2 | CC-Link IE Field Network Basic Master Application sample code | 2 | CC-Link IE Field Network Basic Master Application sample code |
3 | 3 | ||
4 | readme | 4 | readme.txt |
5 | 5 | ||
6 | --------------------------------------------------------------------- | 6 | --------------------------------------------------------------------- |
7 | 7 | ||
@@ -13,4 +13,10 @@ root -+- library -+- include ... SLMP library code header file | |||
13 | +- sample -+- include ... user sample program header file | 13 | +- sample -+- include ... user sample program header file |
14 | | +- src ... user sample program code file | 14 | | +- src ... user sample program code file |
15 | | | 15 | | |
16 | +- manual --- User manual \ No newline at end of file | 16 | +- build -+- linux ... Makefile for Linux |
17 | | | ||
18 | | | ||
19 | +- manual --- User manual | ||
20 | | | ||
21 | | | ||
22 | +- version.txt --- Version information | ||
diff --git a/CCIEF-BASIC_Master/MasterParameter.csv b/CCIEF-BASIC_Master/sample/MasterParameter.csv index c9d5b76..c9d5b76 100644 --- a/CCIEF-BASIC_Master/MasterParameter.csv +++ b/CCIEF-BASIC_Master/sample/MasterParameter.csv | |||
diff --git a/CCIEF-BASIC_Slave/Makefile b/CCIEF-BASIC_Slave/Makefile deleted file mode 100644 index 408c863..0000000 --- a/CCIEF-BASIC_Slave/Makefile +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Slave_sample: SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o | ||
2 | gcc -o Slave_sample SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o | ||
3 | |||
4 | SLMP.o: library/src/SLMP.c | ||
5 | gcc -I library/include -c library/src/SLMP.c | ||
6 | SOCKET.o: sample/src/SOCKET.c | ||
7 | gcc -I sample/include -c sample/src/SOCKET.c | ||
8 | TIMER.o: sample/src/TIMER.c | ||
9 | gcc -I sample/include -c sample/src/TIMER.c | ||
10 | CCIEF_BASIC_SLAVE.o: sample/src/CCIEF_BASIC_SLAVE.c | ||
11 | gcc -I sample/include -I library/include -c sample/src/CCIEF_BASIC_SLAVE.c | ||
12 | SLMP_SERVER.o: sample/src/SLMP_SERVER.c | ||
13 | gcc -I sample/include -I library/include -c sample/src/SLMP_SERVER.c | ||
14 | USER_SAMPLE.o: sample/src/USER_SAMPLE.c | ||
15 | gcc -I sample/include -I library/include -c sample/src/USER_SAMPLE.c | ||
16 | clean: | ||
17 | rm -f SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o \ No newline at end of file | ||
diff --git a/CCIEF-BASIC_Slave/build/linux/Makefile b/CCIEF-BASIC_Slave/build/linux/Makefile new file mode 100644 index 0000000..fda83bf --- /dev/null +++ b/CCIEF-BASIC_Slave/build/linux/Makefile | |||
@@ -0,0 +1,17 @@ | |||
1 | Slave_sample: SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o | ||
2 | $(CC) -o Slave_sample SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o | ||
3 | |||
4 | SLMP.o: ../../library/src/SLMP.c | ||
5 | $(CC) -I ../../library/include -c ../../library/src/SLMP.c | ||
6 | SOCKET.o: ../../sample/src/SOCKET.c | ||
7 | $(CC) -I ../../sample/include -c ../../sample/src/SOCKET.c | ||
8 | TIMER.o: ../../sample/src/TIMER.c | ||
9 | $(CC) -I ../../sample/include -c ../../sample/src/TIMER.c | ||
10 | CCIEF_BASIC_SLAVE.o: ../../sample/src/CCIEF_BASIC_SLAVE.c | ||
11 | $(CC) -I ../../sample/include -I ../../library/include -c ../../sample/src/CCIEF_BASIC_SLAVE.c | ||
12 | SLMP_SERVER.o: ../../sample/src/SLMP_SERVER.c | ||
13 | $(CC) -I ../../sample/include -I ../../library/include -c ../../sample/src/SLMP_SERVER.c | ||
14 | USER_SAMPLE.o: ../../sample/src/USER_SAMPLE.c | ||
15 | $(CC) -I ../../sample/include -I ../../library/include -c ../../sample/src/USER_SAMPLE.c | ||
16 | clean: | ||
17 | rm -f SLMP.o SOCKET.o TIMER.o CCIEF_BASIC_SLAVE.o SLMP_SERVER.o USER_SAMPLE.o Slave_sample | ||
diff --git a/CCIEF-BASIC_Slave/readme.txt b/CCIEF-BASIC_Slave/readme.txt index ccd70f6..7e932ce 100644 --- a/CCIEF-BASIC_Slave/readme.txt +++ b/CCIEF-BASIC_Slave/readme.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | --------------------------------------------------------------------- | 1 | --------------------------------------------------------------------- |
2 | CC-Link IE Field Network Basic Slave Application sample code | 2 | CC-Link IE Field Network Basic Slave Application sample code |
3 | 3 | ||
4 | readme | 4 | readme.txt |
5 | 5 | ||
6 | --------------------------------------------------------------------- | 6 | --------------------------------------------------------------------- |
7 | 7 | ||
@@ -13,4 +13,10 @@ root -+- library -+- include ... SLMP library code header file | |||
13 | +- sample -+- include ... user sample program header file | 13 | +- sample -+- include ... user sample program header file |
14 | | +- src ... user sample program code file | 14 | | +- src ... user sample program code file |
15 | | | 15 | | |
16 | +- manual --- User manual \ No newline at end of file | 16 | +- build -+- linux ... Makefile for Linux |
17 | | | ||
18 | | | ||
19 | +- manual --- User manual | ||
20 | | | ||
21 | | | ||
22 | +- version.txt --- Version information | ||
diff --git a/CCIEF-BASIC_Slave/SlaveParameter.csv b/CCIEF-BASIC_Slave/sample/SlaveParameter.csv index b7e4024..b7e4024 100644 --- a/CCIEF-BASIC_Slave/SlaveParameter.csv +++ b/CCIEF-BASIC_Slave/sample/SlaveParameter.csv | |||