Skip to content
Snippets Groups Projects
Commit 7508ccae authored by Alex Gardner's avatar Alex Gardner
Browse files

Merge branch 'dev' into 'master'

v0.7.2

See merge request voxl-public/utilities/voxl-utils!13
parents 351a8f6d e93527a9
No related branches found
No related tags found
1 merge request!13v0.7.2
Pipeline #363641039 passed
0.7.2
* voxl-wifi no longer requires a reboot to take effect
0.7.0
* new voxl-configure-cameras with new args and options for image rotation
0.6.9
......
_voxl-configure-cameras(){
local OPTS=('m500_flight_deck useeker_voxlcam rotate_tracking rotate_stereo disable help')
local LATE_OPTS=('rotate_tracking rotate_stereo')
COMPREPLY=()
if [ "$COMP_CWORD" -eq 1 ]; then
COMPREPLY=( $(compgen -W '${OPTS}' -- ${COMP_WORDS[COMP_CWORD]}) )
return 0
fi
COMPREPLY=( $(compgen -W '${LATE_OPTS}' -- ${COMP_WORDS[COMP_CWORD]}) )
return 0
}
complete -F _voxl-configure-cameras voxl-configure-cameras
......@@ -44,16 +44,12 @@ print_usage(){
echo " Inspect and configure the environment settings."
echo ""
echo "Usage:"
echo " ${UTIL_NAME} show"
echo " ${UTIL_NAME}"
echo " Display the current environment settings"
echo ""
}
if [[ $# -eq 0 ]]; then
echo "Illegal usage"
print_usage
exit 1
elif [[ $1 == "show" ]]; then
echo "ROS_MASTER_URI=${ROS_MASTER_URI}"
echo "ROS_IP=${ROS_IP}"
echo "CAM_CONFIG_ID=${CAM_CONFIG_ID}"
......@@ -61,9 +57,6 @@ elif [[ $1 == "show" ]]; then
echo "TRACKING_CAM_ID=${TRACKING_CAM_ID}"
echo "STEREO_CAM_ID=${STEREO_CAM_ID}"
echo "TOF_CAM_ID=${TOF_CAM_ID}"
exit 0
else
echo "Illegal usage"
print_usage
exit 1
fi
......@@ -227,9 +227,6 @@ if [ $mode == "softap" ]; then
# change ip address to 192.168.8.1
# this script also exists at /etc/init.d/wlan0 but that doesn't seem to be used
sed -i 's/192.168.[0-9]\+./192.168.8./g' /etc/initscripts/wlan
echo "Reboot for changes to take effect."
echo "Once connected, you should be able to ping the"
echo "board at 192.168.8.1 on its own access point."
elif [ $mode == "station" ]; then
# if an ssid argument was given in softap mode, use it
......@@ -246,19 +243,23 @@ elif [ $mode == "station" ]; then
fi
create_station_conf_file
echo sta > wlan_mode
echo ""
#echo "If you didn't provide SSID and KEY arguments,"
#echo "Please EDIT the ssid, psk and other fields in the following file!"
#echo "vi /data/misc/wifi/wpa_supplicant.conf"
echo "Reboot for changes to take effect"
elif [ $mode == "getmode" ]; then
get_current_mode
exit 0
else
echo "Illegal command: $mode"
print_usage
exit 1
fi
#Reset the wlan service
/etc/initscripts/wlan stop 2>/dev/null >/dev/null
/etc/initscripts/wlan start 2>/dev/null >/dev/null
echo ""
echo "Wifi Setup Complete!"
echo "Changes should be active in a few seconds"
echo "Check ifconfig for an IP Address"
cd - > /dev/null
Package: voxl-utils
Version: 0.7.1
Version: 0.7.2
Section: base
Priority: optional
Architecture: armv7a
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment