Changes included in release 4.2

tiiuae · Aug 15, 2021 · 0b3d193 · 0b3d193
1 parent ed9df6a
commit 0b3d193
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/fogsw_configs b/fogsw_configs
diff --git a/packaging/debian/control b/packaging/debian/control
@@ -5,24 +5,25 @@ Architecture: amd64
 Description: FOG SW meta package.
 Depends: agent-protocol-splitter (= 1.0.0-13~git20210419.ed16b42),
   communication-link (= 2.0.0-34~git20210714.48caad1),
-  fog-sw-systemd-services (= 1.0.0-40~git20210716.4341d9b),
+  fog-sw-systemd-services (= 1.0.0-42~git20210810.a41d199),
   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-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-42~git20210715.70a346d),
+  ros-foxy-mesh-com (= 0.3.4-51~git20210804.73acdb9),
   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),
   rtl8812au-kmod (= 1.0.0-2~git20210614.dc56cff),
   ros-foxy-control-interface (= 0.0.3-17~git20210709.22ce14e),
   ros-foxy-fog-msgs (= 0.0.3-6~git20210621.90040f9),
-  ros-foxy-navigation (= 0.0.3-16~git20210709.f083eee),
+  ros-foxy-navigation (= 0.0.3-22~git20210810.97dc304),
   ros-foxy-octomap-server2 (= 0.0.1-6~git20210617.22fd119),
-  ros-foxy-rplidar-ros2 (= 1.10.0-10~git20210615.cbb80ba)
+  ros-foxy-rplidar-ros2 (= 1.10.0-10~git20210615.cbb80ba),
+  wpasupplicant (= 2.9.0-20-6~git20210701.43d8971)
 Conflicts: ros-foxy-px4-mavlink-ctrl
-Recomends: fogsw-configs (= 1.0.0-30~git20210716.63a4726),
+Recomends: fogsw-configs (= 1.0.0-40~git20210813.9ff7aa9),
   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.1~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
+    version=4.2~$(git log --date=format:%Y%m%d --pretty=git%cd.%h -n 1)
     echo ${version}
 }
 

diff --git a/ros2_ws/src/mesh_com b/ros2_ws/src/mesh_com
diff --git a/ros2_ws/src/navigation b/ros2_ws/src/navigation
diff --git a/systemd b/systemd
+1 −1		common/core/os/openwrt
+1 −1		common/core/os/ubuntu/wpa_supplicant
+347 −0		common/scripts/mesh-11s-mr.sh
+4 −1		common/scripts/mesh-11s.sh
+5 −0		modules/mesh_com/debian/prerm
+1 −1		modules/mesh_com/package.xml
+43 −11		modules/sc-mesh-secure-deployment/configure.sh
+1 −0		modules/sc-mesh-secure-deployment/requirements/server-requirements.txt
+71 −80		modules/sc-mesh-secure-deployment/src/client-mesh.py
+32 −0		modules/sc-mesh-secure-deployment/src/mesh_com.conf
+39 −47		modules/sc-mesh-secure-deployment/src/server-mesh.py
+156 −0		modules/utils/monitor_phy_param.py
+19 −0		modules/utils/phy_param.conf
+14 −6		.github/workflows/main.yaml
+1 −1		config/navigation.yaml
+2 −2		system/mission-data-recorder.service
+2 −2		vm-main/system/mission-data-recorder.service