summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2015-02-06 10:50:34 +0800
committerBernard Xiong <[email protected]>2015-02-06 10:50:34 +0800
commitafefbc0e139e467df5e9e56ea3fa7627f3564adc (patch)
tree8ba299caa91fc3d1963c9e9913f4633a82b72704
parent15129278d7092cb92d86930dab1cf1bfaacc0fc1 (diff)
parent278ae90e8403285fbcf00275d04dfc17e1c6a8e6 (diff)
Merge pull request #428 from armink/master
修改FreeModbus文件夹名称
-rw-r--r--components/net/freemodbus/Changelog.txt (renamed from components/net/freemodbus-v1.6.0/Changelog.txt)0
-rw-r--r--components/net/freemodbus/SConscript (renamed from components/net/freemodbus-v1.6.0/SConscript)0
-rw-r--r--components/net/freemodbus/bsd.txt (renamed from components/net/freemodbus-v1.6.0/bsd.txt)0
-rw-r--r--components/net/freemodbus/gpl.txt (renamed from components/net/freemodbus-v1.6.0/gpl.txt)0
-rw-r--r--components/net/freemodbus/lgpl.txt (renamed from components/net/freemodbus-v1.6.0/lgpl.txt)0
-rw-r--r--components/net/freemodbus/modbus/ascii/mbascii.c (renamed from components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.c)0
-rw-r--r--components/net/freemodbus/modbus/ascii/mbascii.h (renamed from components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.h)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfunccoils.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfunccoils_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils_m.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncdiag.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdiag.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncdisc.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncdisc_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc_m.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncholding.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncholding_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding_m.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncinput.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncinput_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput_m.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbfuncother.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbfuncother.c)0
-rw-r--r--components/net/freemodbus/modbus/functions/mbutils.c (renamed from components/net/freemodbus-v1.6.0/modbus/functions/mbutils.c)0
-rw-r--r--components/net/freemodbus/modbus/include/mb.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mb.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mb_m.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mb_m.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbconfig.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbconfig.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbframe.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbframe.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbfunc.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbfunc.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbport.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbport.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbproto.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbproto.h)0
-rw-r--r--components/net/freemodbus/modbus/include/mbutils.h (renamed from components/net/freemodbus-v1.6.0/modbus/include/mbutils.h)0
-rw-r--r--components/net/freemodbus/modbus/mb.c (renamed from components/net/freemodbus-v1.6.0/modbus/mb.c)0
-rw-r--r--components/net/freemodbus/modbus/mb_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/mb_m.c)0
-rw-r--r--components/net/freemodbus/modbus/rtu/mbcrc.c (renamed from components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.c)0
-rw-r--r--components/net/freemodbus/modbus/rtu/mbcrc.h (renamed from components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.h)0
-rw-r--r--components/net/freemodbus/modbus/rtu/mbrtu.c (renamed from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.c)0
-rw-r--r--components/net/freemodbus/modbus/rtu/mbrtu.h (renamed from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.h)0
-rw-r--r--components/net/freemodbus/modbus/rtu/mbrtu_m.c (renamed from components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu_m.c)0
-rw-r--r--components/net/freemodbus/modbus/tcp/mbtcp.c (renamed from components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.c)0
-rw-r--r--components/net/freemodbus/modbus/tcp/mbtcp.h (renamed from components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.h)0
-rw-r--r--components/net/freemodbus/port/port.c (renamed from components/net/freemodbus-v1.6.0/port/port.c)0
-rw-r--r--components/net/freemodbus/port/port.h (renamed from components/net/freemodbus-v1.6.0/port/port.h)0
-rw-r--r--components/net/freemodbus/port/portevent.c (renamed from components/net/freemodbus-v1.6.0/port/portevent.c)0
-rw-r--r--components/net/freemodbus/port/portevent_m.c (renamed from components/net/freemodbus-v1.6.0/port/portevent_m.c)0
-rw-r--r--components/net/freemodbus/port/portserial.c (renamed from components/net/freemodbus-v1.6.0/port/portserial.c)0
-rw-r--r--components/net/freemodbus/port/portserial_m.c (renamed from components/net/freemodbus-v1.6.0/port/portserial_m.c)0
-rw-r--r--components/net/freemodbus/port/porttimer.c (renamed from components/net/freemodbus-v1.6.0/port/porttimer.c)0
-rw-r--r--components/net/freemodbus/port/porttimer_m.c (renamed from components/net/freemodbus-v1.6.0/port/porttimer_m.c)0
-rw-r--r--components/net/freemodbus/port/user_mb_app.c (renamed from components/net/freemodbus-v1.6.0/port/user_mb_app.c)0
-rw-r--r--components/net/freemodbus/port/user_mb_app.h (renamed from components/net/freemodbus-v1.6.0/port/user_mb_app.h)0
-rw-r--r--components/net/freemodbus/port/user_mb_app_m.c (renamed from components/net/freemodbus-v1.6.0/port/user_mb_app_m.c)0
46 files changed, 0 insertions, 0 deletions
diff --git a/components/net/freemodbus-v1.6.0/Changelog.txt b/components/net/freemodbus/Changelog.txt
index 2816ea30f3..2816ea30f3 100644
--- a/components/net/freemodbus-v1.6.0/Changelog.txt
+++ b/components/net/freemodbus/Changelog.txt
diff --git a/components/net/freemodbus-v1.6.0/SConscript b/components/net/freemodbus/SConscript
index d613a9f398..d613a9f398 100644
--- a/components/net/freemodbus-v1.6.0/SConscript
+++ b/components/net/freemodbus/SConscript
diff --git a/components/net/freemodbus-v1.6.0/bsd.txt b/components/net/freemodbus/bsd.txt
index 362d3e37c8..362d3e37c8 100644
--- a/components/net/freemodbus-v1.6.0/bsd.txt
+++ b/components/net/freemodbus/bsd.txt
diff --git a/components/net/freemodbus-v1.6.0/gpl.txt b/components/net/freemodbus/gpl.txt
index 3912109b5c..3912109b5c 100644
--- a/components/net/freemodbus-v1.6.0/gpl.txt
+++ b/components/net/freemodbus/gpl.txt
diff --git a/components/net/freemodbus-v1.6.0/lgpl.txt b/components/net/freemodbus/lgpl.txt
index 8add30ad59..8add30ad59 100644
--- a/components/net/freemodbus-v1.6.0/lgpl.txt
+++ b/components/net/freemodbus/lgpl.txt
diff --git a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.c b/components/net/freemodbus/modbus/ascii/mbascii.c
index b0f3bc05d2..b0f3bc05d2 100644
--- a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.c
+++ b/components/net/freemodbus/modbus/ascii/mbascii.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.h b/components/net/freemodbus/modbus/ascii/mbascii.h
index cdec83ff00..cdec83ff00 100644
--- a/components/net/freemodbus-v1.6.0/modbus/ascii/mbascii.h
+++ b/components/net/freemodbus/modbus/ascii/mbascii.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils.c b/components/net/freemodbus/modbus/functions/mbfunccoils.c
index 681bd50656..681bd50656 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils.c
+++ b/components/net/freemodbus/modbus/functions/mbfunccoils.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils_m.c b/components/net/freemodbus/modbus/functions/mbfunccoils_m.c
index f6bb51cdf6..f6bb51cdf6 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfunccoils_m.c
+++ b/components/net/freemodbus/modbus/functions/mbfunccoils_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdiag.c b/components/net/freemodbus/modbus/functions/mbfuncdiag.c
index d75ffc0f72..d75ffc0f72 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdiag.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncdiag.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc.c b/components/net/freemodbus/modbus/functions/mbfuncdisc.c
index fb378441b9..fb378441b9 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncdisc.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc_m.c b/components/net/freemodbus/modbus/functions/mbfuncdisc_m.c
index 6c8d6c4741..6c8d6c4741 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncdisc_m.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncdisc_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding.c b/components/net/freemodbus/modbus/functions/mbfuncholding.c
index e74a0624dc..e74a0624dc 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncholding.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding_m.c b/components/net/freemodbus/modbus/functions/mbfuncholding_m.c
index e1fe69e383..e1fe69e383 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncholding_m.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncholding_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput.c b/components/net/freemodbus/modbus/functions/mbfuncinput.c
index cceedbafea..cceedbafea 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncinput.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput_m.c b/components/net/freemodbus/modbus/functions/mbfuncinput_m.c
index 2127efef67..2127efef67 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncinput_m.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncinput_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncother.c b/components/net/freemodbus/modbus/functions/mbfuncother.c
index fcee972bf8..fcee972bf8 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbfuncother.c
+++ b/components/net/freemodbus/modbus/functions/mbfuncother.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/functions/mbutils.c b/components/net/freemodbus/modbus/functions/mbutils.c
index 4ffbd3e001..4ffbd3e001 100644
--- a/components/net/freemodbus-v1.6.0/modbus/functions/mbutils.c
+++ b/components/net/freemodbus/modbus/functions/mbutils.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mb.h b/components/net/freemodbus/modbus/include/mb.h
index 8d6be7b422..8d6be7b422 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mb.h
+++ b/components/net/freemodbus/modbus/include/mb.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mb_m.h b/components/net/freemodbus/modbus/include/mb_m.h
index f6b25e2cf3..f6b25e2cf3 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mb_m.h
+++ b/components/net/freemodbus/modbus/include/mb_m.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbconfig.h b/components/net/freemodbus/modbus/include/mbconfig.h
index 89030b7abd..89030b7abd 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbconfig.h
+++ b/components/net/freemodbus/modbus/include/mbconfig.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbframe.h b/components/net/freemodbus/modbus/include/mbframe.h
index 99d59c613e..99d59c613e 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbframe.h
+++ b/components/net/freemodbus/modbus/include/mbframe.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbfunc.h b/components/net/freemodbus/modbus/include/mbfunc.h
index 3f9c2725a1..3f9c2725a1 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbfunc.h
+++ b/components/net/freemodbus/modbus/include/mbfunc.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbport.h b/components/net/freemodbus/modbus/include/mbport.h
index 11794a2929..11794a2929 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbport.h
+++ b/components/net/freemodbus/modbus/include/mbport.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbproto.h b/components/net/freemodbus/modbus/include/mbproto.h
index 786aaf4030..786aaf4030 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbproto.h
+++ b/components/net/freemodbus/modbus/include/mbproto.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/include/mbutils.h b/components/net/freemodbus/modbus/include/mbutils.h
index 61495751d4..61495751d4 100644
--- a/components/net/freemodbus-v1.6.0/modbus/include/mbutils.h
+++ b/components/net/freemodbus/modbus/include/mbutils.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/mb.c b/components/net/freemodbus/modbus/mb.c
index 96d693c910..96d693c910 100644
--- a/components/net/freemodbus-v1.6.0/modbus/mb.c
+++ b/components/net/freemodbus/modbus/mb.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/mb_m.c b/components/net/freemodbus/modbus/mb_m.c
index 4e7c4b2b74..4e7c4b2b74 100644
--- a/components/net/freemodbus-v1.6.0/modbus/mb_m.c
+++ b/components/net/freemodbus/modbus/mb_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.c b/components/net/freemodbus/modbus/rtu/mbcrc.c
index 29b9ea765a..29b9ea765a 100644
--- a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.c
+++ b/components/net/freemodbus/modbus/rtu/mbcrc.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.h b/components/net/freemodbus/modbus/rtu/mbcrc.h
index db227763f1..db227763f1 100644
--- a/components/net/freemodbus-v1.6.0/modbus/rtu/mbcrc.h
+++ b/components/net/freemodbus/modbus/rtu/mbcrc.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.c b/components/net/freemodbus/modbus/rtu/mbrtu.c
index c023c92654..c023c92654 100644
--- a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.c
+++ b/components/net/freemodbus/modbus/rtu/mbrtu.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.h b/components/net/freemodbus/modbus/rtu/mbrtu.h
index 98c43de4aa..98c43de4aa 100644
--- a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu.h
+++ b/components/net/freemodbus/modbus/rtu/mbrtu.h
diff --git a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu_m.c b/components/net/freemodbus/modbus/rtu/mbrtu_m.c
index 987c9a3156..987c9a3156 100644
--- a/components/net/freemodbus-v1.6.0/modbus/rtu/mbrtu_m.c
+++ b/components/net/freemodbus/modbus/rtu/mbrtu_m.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.c b/components/net/freemodbus/modbus/tcp/mbtcp.c
index 3eb3b7071f..3eb3b7071f 100644
--- a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.c
+++ b/components/net/freemodbus/modbus/tcp/mbtcp.c
diff --git a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.h b/components/net/freemodbus/modbus/tcp/mbtcp.h
index 905d113c5a..905d113c5a 100644
--- a/components/net/freemodbus-v1.6.0/modbus/tcp/mbtcp.h
+++ b/components/net/freemodbus/modbus/tcp/mbtcp.h
diff --git a/components/net/freemodbus-v1.6.0/port/port.c b/components/net/freemodbus/port/port.c
index d01c5c9d6a..d01c5c9d6a 100644
--- a/components/net/freemodbus-v1.6.0/port/port.c
+++ b/components/net/freemodbus/port/port.c
diff --git a/components/net/freemodbus-v1.6.0/port/port.h b/components/net/freemodbus/port/port.h
index 73d2177c9a..73d2177c9a 100644
--- a/components/net/freemodbus-v1.6.0/port/port.h
+++ b/components/net/freemodbus/port/port.h
diff --git a/components/net/freemodbus-v1.6.0/port/portevent.c b/components/net/freemodbus/port/portevent.c
index 1a881166be..1a881166be 100644
--- a/components/net/freemodbus-v1.6.0/port/portevent.c
+++ b/components/net/freemodbus/port/portevent.c
diff --git a/components/net/freemodbus-v1.6.0/port/portevent_m.c b/components/net/freemodbus/port/portevent_m.c
index 031a3b84ef..031a3b84ef 100644
--- a/components/net/freemodbus-v1.6.0/port/portevent_m.c
+++ b/components/net/freemodbus/port/portevent_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/portserial.c b/components/net/freemodbus/port/portserial.c
index 317c7f4605..317c7f4605 100644
--- a/components/net/freemodbus-v1.6.0/port/portserial.c
+++ b/components/net/freemodbus/port/portserial.c
diff --git a/components/net/freemodbus-v1.6.0/port/portserial_m.c b/components/net/freemodbus/port/portserial_m.c
index 8ec0d081f1..8ec0d081f1 100644
--- a/components/net/freemodbus-v1.6.0/port/portserial_m.c
+++ b/components/net/freemodbus/port/portserial_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/porttimer.c b/components/net/freemodbus/port/porttimer.c
index 6f017d8759..6f017d8759 100644
--- a/components/net/freemodbus-v1.6.0/port/porttimer.c
+++ b/components/net/freemodbus/port/porttimer.c
diff --git a/components/net/freemodbus-v1.6.0/port/porttimer_m.c b/components/net/freemodbus/port/porttimer_m.c
index 00441bfd1c..00441bfd1c 100644
--- a/components/net/freemodbus-v1.6.0/port/porttimer_m.c
+++ b/components/net/freemodbus/port/porttimer_m.c
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app.c b/components/net/freemodbus/port/user_mb_app.c
index 8da7376336..8da7376336 100644
--- a/components/net/freemodbus-v1.6.0/port/user_mb_app.c
+++ b/components/net/freemodbus/port/user_mb_app.c
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app.h b/components/net/freemodbus/port/user_mb_app.h
index 864c3860bf..864c3860bf 100644
--- a/components/net/freemodbus-v1.6.0/port/user_mb_app.h
+++ b/components/net/freemodbus/port/user_mb_app.h
diff --git a/components/net/freemodbus-v1.6.0/port/user_mb_app_m.c b/components/net/freemodbus/port/user_mb_app_m.c
index 12fabf21ac..12fabf21ac 100644
--- a/components/net/freemodbus-v1.6.0/port/user_mb_app_m.c
+++ b/components/net/freemodbus/port/user_mb_app_m.c