Merge pull request #76 from tiiuae/rel_4_1

Release 4.1
tiiuae · Jul 16, 2021 · 3b9cb75 · 3b9cb75
2 parents 958ab30 + eb03742
commit 3b9cb75
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/fogsw_configs b/fogsw_configs
diff --git a/mission-data-recorder b/mission-data-recorder
diff --git a/packaging/debian/control b/packaging/debian/control
@@ -4,16 +4,16 @@ Maintainer: manuel.segarra-abad <[email protected]>
 Architecture: amd64
 Description: FOG SW meta package.
 Depends: agent-protocol-splitter (= 1.0.0-13~git20210419.ed16b42),
-  communication-link (= 2.0.0-33~git20210701.545ea2f),
-  fog-sw-systemd-services (= 1.0.0-36~git20210709.bd3efff),
+  communication-link (= 2.0.0-34~git20210714.48caad1),
+  fog-sw-systemd-services (= 1.0.0-40~git20210716.4341d9b),
   libsurvive (= 1.0.0-3~git20210421.b966a6c),
   mavlink-router (= 1.0.0-6~git20210419.14c1368),
   mavsdk (= 0.34.0),
-  mission-data-recorder (= 1.0.0-28~git20210707.ff24897),
+  mission-data-recorder (= 1.0.0-29~git20210713.3f87b16),
   mission-engine (= 2.0.0-16~git20210701.545ea2f),
   ros-foxy-depthai-ctrl (= 0.5.6-34~git20210624.1f5590e),
   ros-foxy-indoor-pos (= 1.0.0-12~git20210426.81d1987),
-  ros-foxy-mesh-com (= 0.3.3-34~git20210611.0d866b2),
+  ros-foxy-mesh-com (= 0.3.3-42~git20210715.70a346d),
   ros-foxy-mocap-pose (= 0.0.4-3~git20210617.713e012),
   ros-foxy-px4-msgs (= 2.0.1-5~git20210419.b4c4a12),
   ros-foxy-px4-ros-com (= 0.1.0-20~git20210708.a1147fa),
@@ -24,5 +24,5 @@ Depends: agent-protocol-splitter (= 1.0.0-13~git20210419.ed16b42),
   ros-foxy-octomap-server2 (= 0.0.1-6~git20210617.22fd119),
   ros-foxy-rplidar-ros2 (= 1.10.0-10~git20210615.cbb80ba)
 Conflicts: ros-foxy-px4-mavlink-ctrl
-Recomends: fogsw-configs (= 1.0.0-14~git20210621.dab9587),
-  px4-firmware-updater (= 1.11.0-1.0.7-7-g913cf7bbd9)
+Recomends: fogsw-configs (= 1.0.0-30~git20210716.63a4726),
+  px4-firmware-updater (= 1.11.0-1.0.8-2-g03d44137d0)
diff --git a/packaging/package.sh b/packaging/package.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 get_version() {
-    version=4.0~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
+    version=4.1~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
     echo ${version}
 }
 

diff --git a/ros2_ws/src/communication_link b/ros2_ws/src/communication_link
diff --git a/ros2_ws/src/mesh_com b/ros2_ws/src/mesh_com
diff --git a/systemd b/systemd
+0 −1		system/communication_link.service
+3 −2		system/mission-data-recorder.service
+1 −1		system/mocap_pose.service
+0 −1		vm-comms/system/communication_link.service
+3 −2		vm-main/system/mission-data-recorder.service
+1 −1		vm-main/system/mocap_pose.service