From efb202106f150c70f07a3ea123871d5a94d2eda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Mon, 6 Aug 2018 14:24:15 +0200
Subject: [PATCH] bbblue: required changes for posix shell

---
 platforms/posix/CMakeLists.txt     | 10 +---------
 posix-configs/bbblue/px4.config    |  5 +++++
 posix-configs/bbblue/px4_fw.config |  5 +++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/platforms/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt
index 25471c07dd..ce879f4877 100644
--- a/platforms/posix/CMakeLists.txt
+++ b/platforms/posix/CMakeLists.txt
@@ -85,20 +85,12 @@ elseif ("${BOARD}" STREQUAL "bbblue")
 	target_link_libraries(px4 PRIVATE robotcontrol)
 
 	add_custom_target(upload
-		COMMAND scp -r ${PX4_SOURCE_DIR}/posix-configs/bbblue/*.config  debian@BBBluePX4:/home/debian/px4/posix-configs
-		COMMAND scp -r ${PX4_SOURCE_DIR}/ROMFS   $<TARGET_FILE:px4>     debian@BBBluePX4:/home/debian/px4
+		COMMAND rsync -arh --progress ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${PX4_SOURCE_DIR}/posix-configs/bbblue/*.config ${PX4_SOURCE_DIR}/ROMFS debian@BBBluePX4:/home/debian/px4
 		DEPENDS px4
 		COMMENT "uploading px4 and data files"
 		USES_TERMINAL
 		)
 
-	add_custom_target(upload_px4
-		COMMAND scp -r  $<TARGET_FILE:px4>   debian@BBBluePX4:/home/debian/px4
-		DEPENDS px4
-		COMMENT "uploading px4"
-		USES_TERMINAL
-		)
-
 elseif ("${BOARD}" STREQUAL "bebop")
 
 	add_custom_target(upload
diff --git a/posix-configs/bbblue/px4.config b/posix-configs/bbblue/px4.config
index 99480f8612..420cf6aa22 100644
--- a/posix-configs/bbblue/px4.config
+++ b/posix-configs/bbblue/px4.config
@@ -1,3 +1,8 @@
+#!/usr/bin/bash
+# PX4 commands need the 'px4-' prefix in bash.
+# (px4-alias.sh is expected to be in the PATH)
+source px4-alias.sh
+
 # config for a quad
 # modified from ../rpi/px4.config
 
diff --git a/posix-configs/bbblue/px4_fw.config b/posix-configs/bbblue/px4_fw.config
index d235430ec1..213455a917 100644
--- a/posix-configs/bbblue/px4_fw.config
+++ b/posix-configs/bbblue/px4_fw.config
@@ -1,3 +1,8 @@
+#!/usr/bin/bash
+# PX4 commands need the 'px4-' prefix in bash.
+# (px4-alias.sh is expected to be in the PATH)
+source px4-alias.sh
+
 # config for fixed wing (FW)
 # modified from ./px4.config, switch att/pos_control & mixer