wip: squashed patch

Tools/auterion/remote_update_fmu.sh

@@ -0,0 +1,97 @@
+#!/bin/bash
+# Flash PX4 to a device running AOS in the local network
+if [ "$1" == "-h" ] || [ "$1" == "--help" ] || [ $# -lt 2 ]; then
+	echo "Usage: $0 -f <firmware.px4|.elf> [-c <configuration_dir>] -d <IP/Device> [-u <user>] [-p <ssh_port>]"
+	exit 1
+fi
+
+ssh_port=22
+ssh_user=root
+
+while getopts ":f:c:d:p:u:" opt; do
+	case ${opt} in
+		f )
+			if [ -n "$OPTARG" ]; then
+				firmware_file="$OPTARG"
+			else
+				echo "ERROR: -f requires a non-empty option argument."
+				exit 1
+			fi
+			;;
+		c )
+			if [ -f "$OPTARG/rc.autostart" ]; then
+				config_dir="$OPTARG"
+			else
+				echo "ERROR: -c configuration directory is empty or does not contain a valid rc.autostart"
+				exit 1
+			fi
+			;;
+		d )
+			if [ "$OPTARG" ]; then
+				device="$OPTARG"
+			else
+				echo "ERROR: -d requires a non-empty option argument."
+				exit 1
+			fi
+			;;
+		p )
+			if [[ "$OPTARG" =~ ^[0-9]+$ ]]; then
+				ssh_port="$OPTARG"
+			else
+				echo "ERROR: -p ssh_port must be a number."
+				exit 1
+			fi
+			;;
+		u )
+			if [ "$OPTARG" ]; then
+				ssh_user="$OPTARG"
+			else
+				echo "ERROR: -u requires a non-empty option argument."
+				exit 1
+			fi
+			;;
+	esac
+done
+
+target_dir=/shared_container_dir/fmu
+
+# create update-dev.tar
+target_file_name="update-dev.tar"
+tmp_dir="$(mktemp -d)"
+config_path=""
+firmware_path=""
+
+if [ -d "$config_dir" ]; then
+	cp -r "$config_dir" "$tmp_dir/config"
+	config_path=config
+fi
+
+if [ -f "$firmware_file" ]; then
+	extension="${firmware_file##*.}"
+	cp "$firmware_file" "$tmp_dir/firmware.$extension"
+	if [ "$extension" == "elf" ]; then
+		# ensure the file is stripped to reduce file size
+		arm-none-eabi-strip "$tmp_dir/firmware.$extension"
+	fi
+	firmware_path="firmware.$extension"
+fi
+
+if [ -z "$device" ]; then
+	echo "Error: missing device"
+	exit 1
+fi
+
+pushd "$tmp_dir" &>/dev/null
+
+if [ -z $firmware_path ] && [ -z $config_path ]; then
+	exit 1
+fi
+
+tar -C "$tmp_dir" --sort=name --owner=root:0 --group=root:0 --mtime='2019-01-01 00:00:00' -cvf $target_file_name $firmware_path $config_path
+scp -P $ssh_port "$target_file_name" $ssh_user@"$device":$target_dir
+popd &>/dev/null
+rm -rf "$tmp_dir"
+
+# grab status output
+cmd="tail --follow=name $target_dir/update_status 2>/dev/null || true"
+ssh -t -p $ssh_port $ssh_user@$device "$cmd"

Tools/auterion/upload_skynode.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+DIR="$(dirname $(readlink -f $0))"
+PX4_BINARY_FILE="$1"
+DEFAULT_AUTOPILOT_HOST=10.41.0.1
+DEFAULT_AUTOPILOT_PORT=33333
+DEFAULT_AUTOPILOT_USER=auterion
+
+for i in "$@"
+do
+    case $i in
+        --default-ip=*)
+        DEFAULT_AUTOPILOT_HOST="${i#*=}"
+        ;;
+        --default-port=*)
+        DEFAULT_AUTOPILOT_PORT="${i#*=}"
+        ;;
+        --default-user=*)
+        DEFAULT_AUTOPILOT_USER="${i#*=}"
+        ;;
+        *)
+            # unknown option
+        ;;
+    esac
+done
+
+# allow these to be overridden
+[ -z "$AUTOPILOT_HOST" ] && AUTOPILOT_HOST=$DEFAULT_AUTOPILOT_HOST
+[ -z "$AUTOPILOT_PORT" ] && AUTOPILOT_PORT=$DEFAULT_AUTOPILOT_PORT
+[ -z "$AUTOPILOT_USER" ] && AUTOPILOT_USER=$DEFAULT_AUTOPILOT_USER
+
+echo "Uploading to $AUTOPILOT_HOST..."
+
+"$DIR"/remote_update_fmu.sh -f "$PX4_BINARY_FILE" -d "$AUTOPILOT_HOST" -p $AUTOPILOT_PORT -u $AUTOPILOT_USER
+
+exit 0