Compare commits

...

5 Commits

Author SHA1 Message Date
Oleg Kalachev
129936bb4c v0.4.1 2021-02-22 20:42:39 +03:00
Oleg Kalachev
8393fd4c27 Fix building sitl_gazebo (#2) 2021-01-26 15:49:44 +03:00
Oleg Kalachev
141a6f37b5 Add jMAVSim + Clover shortcut 2021-01-13 18:29:54 +03:00
Oleg Kalachev
7b046547a4 Simplify VS Code shortcut title 2021-01-13 18:29:44 +03:00
Oleg Kalachev
29f4118dc6 Use git describe for image name 2020-10-23 16:59:37 +03:00
4 changed files with 32 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
[Desktop Entry]
Name=VS Code + ROS
Name=VS Code
Comment=Code Editing. Redefined.
GenericName=Text Editor
Exec=/bin/bash -c "source /home/clover/catkin_ws/devel/setup.bash; /usr/share/code/code --no-sandbox --unity-launch %F"

View File

@@ -0,0 +1,10 @@
[Desktop Entry]
Version=1.0
Type=Application
Name=jMAVSim + Clover
Comment=A lightweight PX4 simulator + Clover services
Exec=/bin/bash -c 'source /home/clover/catkin_ws/devel/setup.bash; roslaunch clover_simulation simulator.launch type:=jmavsim'
Icon=openjdk-8
Path=
Terminal=true
StartupNotify=false

View File

@@ -25,6 +25,25 @@ index 050558f..7029199 100644
_send_mavlink_message(&msg, srcaddr);
}
@@ -591,6 +592,7 @@ void GeotaggedImagesPlugin::_handle_storage_info(const mavlink_message_t *pMsg,
float total_mib = 0.0f;
float available_mib = 0.0f;
boost::filesystem::space_info si = boost::filesystem::space(".");
+ const std::string storage_name = "SITL Camera Storage";
available_mib = (float)((double)si.available / (1024.0 * 1024.0));
total_mib = (float)((double)si.capacity / (1024.0 * 1024.0));
_send_cmd_ack(pMsg->sysid, pMsg->compid, MAV_CMD_REQUEST_STORAGE_INFORMATION, MAV_RESULT_ACCEPTED, srcaddr);
@@ -608,7 +610,9 @@ void GeotaggedImagesPlugin::_handle_storage_info(const mavlink_message_t *pMsg,
total_mib - available_mib, // used_capacity,
available_mib,
NAN, // read_speed,
- NAN // write_speed
+ NAN, // write_speed
+ STORAGE_TYPE_OTHER, // storage type
+ storage_name.c_str() // storage name
);
_send_mavlink_message(&msg, srcaddr);
}
diff --git a/src/gazebo_mavlink_interface.cpp b/src/gazebo_mavlink_interface.cpp
index 5d29017..d4dd6a7 100644
--- a/src/gazebo_mavlink_interface.cpp

View File

@@ -28,7 +28,8 @@ ${PACKER} build ros_ide_vm.json
echo "--- Marking the VM"
GIT_REV=$(git rev-parse --short HEAD)
VM_NAME="clover-devel_v0.20+${GIT_REV}.ova"
GIT_DESCRIBE=$(git describe --tags)
VM_NAME="clover-devel_${GIT_DESCRIBE}.ova"
mv ./output-virtualbox-ovf/clover-devel.ova ./output-virtualbox-ovf/${VM_NAME}
echo "--- All done!"