From 29f4118dc68914ea18c03bcb751a0be0dfa21d02 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Fri, 23 Oct 2020 16:59:37 +0300 Subject: [PATCH 1/5] Use git describe for image name --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 1f2365c..7939780 100755 --- a/build.sh +++ b/build.sh @@ -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!" From 7b046547a45715472aacbe9691c95c941765a992 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 13 Jan 2021 18:29:44 +0300 Subject: [PATCH 2/5] Simplify VS Code shortcut title --- assets/desktop/code_ros.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/desktop/code_ros.desktop b/assets/desktop/code_ros.desktop index b6294cc..4e497ec 100755 --- a/assets/desktop/code_ros.desktop +++ b/assets/desktop/code_ros.desktop @@ -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" From 141a6f37b509ac22d587756dabe225dea33c4433 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Wed, 13 Jan 2021 18:29:54 +0300 Subject: [PATCH 3/5] Add jMAVSim + Clover shortcut --- assets/desktop/jMAVSim Clover.desktop | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 assets/desktop/jMAVSim Clover.desktop diff --git a/assets/desktop/jMAVSim Clover.desktop b/assets/desktop/jMAVSim Clover.desktop new file mode 100644 index 0000000..772b121 --- /dev/null +++ b/assets/desktop/jMAVSim Clover.desktop @@ -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 From 8393fd4c27ddfe2380c74a8c337ef72bb0548704 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Tue, 26 Jan 2021 15:49:44 +0300 Subject: [PATCH 4/5] Fix building sitl_gazebo (#2) --- assets/patches/sitl_gazebo.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/assets/patches/sitl_gazebo.patch b/assets/patches/sitl_gazebo.patch index 4f71c65..b249c9e 100644 --- a/assets/patches/sitl_gazebo.patch +++ b/assets/patches/sitl_gazebo.patch @@ -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 From 129936bb4c2cfc0e82353fc1bf6b279844bdc739 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Mon, 22 Feb 2021 20:42:39 +0300 Subject: [PATCH 5/5] v0.4.1