From 0fd306868cda25bf1a93ec11c4fd21ba7eff4100 Mon Sep 17 00:00:00 2001 From: Diego Jimenez Bravo Date: Sun, 11 Feb 2018 15:30:40 +0100 Subject: [PATCH 1/3] [#951] Changed names of config files and setup.py not invoked from script --- src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh | 2 ++ src/drivers/MAVLinkServer/MAVProxy/MAVProxyWinLAN.sh | 4 ---- .../MAVProxy/{uav_viewer_py.yml => mavlinkserver.yml} | 0 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100755 src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh delete mode 100755 src/drivers/MAVLinkServer/MAVProxy/MAVProxyWinLAN.sh rename src/drivers/MAVLinkServer/MAVProxy/{uav_viewer_py.yml => mavlinkserver.yml} (100%) diff --git a/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh new file mode 100755 index 000000000..373fe6e84 --- /dev/null +++ b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh @@ -0,0 +1,2 @@ +python2.7 ./mavproxy.py /home/diego/try3/2016-tfg-Diego-Jimenez/MAVProxy/mavlinkserver.yml --master=10.1.1.191:14550 --console +#python2.7 ./MAVProxy/mavproxy.py /home/diego/try3/2016-tfg-Diego-Jimenez/MAVProxy/uav_viewer_py.yml --master=0.0.0.0:14550 --console diff --git a/src/drivers/MAVLinkServer/MAVProxy/MAVProxyWinLAN.sh b/src/drivers/MAVLinkServer/MAVProxy/MAVProxyWinLAN.sh deleted file mode 100755 index 7df4c9d18..000000000 --- a/src/drivers/MAVLinkServer/MAVProxy/MAVProxyWinLAN.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd .. - -python2.7 setup.py build install --user -python2.7 ./MAVProxy/mavproxy.py ./MAVProxy/uav_viewer_py.yml --master=10.1.1.191:14550 --console diff --git a/src/drivers/MAVLinkServer/MAVProxy/uav_viewer_py.yml b/src/drivers/MAVLinkServer/MAVProxy/mavlinkserver.yml similarity index 100% rename from src/drivers/MAVLinkServer/MAVProxy/uav_viewer_py.yml rename to src/drivers/MAVLinkServer/MAVProxy/mavlinkserver.yml From 8d153a1ea131438b13a1180bbaf7801626f4772e Mon Sep 17 00:00:00 2001 From: Diego Jimenez Bravo Date: Sun, 11 Feb 2018 15:36:45 +0100 Subject: [PATCH 2/3] [#951] Changed names of config files and setup.py not invoked from script --- src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh index 373fe6e84..06cd89301 100755 --- a/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh +++ b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh @@ -1,2 +1,2 @@ -python2.7 ./mavproxy.py /home/diego/try3/2016-tfg-Diego-Jimenez/MAVProxy/mavlinkserver.yml --master=10.1.1.191:14550 --console +python2.7 ./mavproxy.py $1 --master=10.1.1.191:14550 --console #python2.7 ./MAVProxy/mavproxy.py /home/diego/try3/2016-tfg-Diego-Jimenez/MAVProxy/uav_viewer_py.yml --master=0.0.0.0:14550 --console From 127ce5a490ed8340cad2593e24541e02cca72f38 Mon Sep 17 00:00:00 2001 From: Diego Jimenez Bravo Date: Sun, 11 Feb 2018 15:38:57 +0100 Subject: [PATCH 3/3] [#951] Changed names of config files and setup.py not invoked from script --- src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh index 06cd89301..9658caf53 100755 --- a/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh +++ b/src/drivers/MAVLinkServer/MAVProxy/MAVLinkServer.sh @@ -1,2 +1,2 @@ +#USE ./MAVLinkServer mavlinkserver.yml python2.7 ./mavproxy.py $1 --master=10.1.1.191:14550 --console -#python2.7 ./MAVProxy/mavproxy.py /home/diego/try3/2016-tfg-Diego-Jimenez/MAVProxy/uav_viewer_py.yml --master=0.0.0.0:14550 --console