diff --git a/conf/radios/T16SZ_SBUS.xml b/conf/radios/T16SZ_SBUS.xml
new file mode 100644
index 0000000000..a802cadefd
--- /dev/null
+++ b/conf/radios/T16SZ_SBUS.xml
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/telemetry/default_fixedwing_gvf.xml b/conf/telemetry/default_fixedwing_gvf.xml
index e08666d525..16c05b6129 100644
--- a/conf/telemetry/default_fixedwing_gvf.xml
+++ b/conf/telemetry/default_fixedwing_gvf.xml
@@ -23,7 +23,6 @@
-
diff --git a/sw/ground_segment/python/gvf/circularFormation.py b/sw/ground_segment/python/gvf/circularFormation.py
index bfb093e3d6..b909031b1d 100644
--- a/sw/ground_segment/python/gvf/circularFormation.py
+++ b/sw/ground_segment/python/gvf/circularFormation.py
@@ -61,9 +61,9 @@ class FormationControl:
self.verbose = verbose
self.ids = self.config['ids']
self.B = np.array(self.config['topology'])
- self.Zdesired = np.array(self.config['desired_intervehicle_angles'])
+ self.Zdesired = np.array(self.config['desired_intervehicle_angles_degrees'])*np.pi/180
self.k = np.array(self.config['gain'])
- self.radius = np.array(self.config['desired_stationary_radius'])
+ self.radius = np.array(self.config['desired_stationary_radius_meters'])
self.aircraft = [Aircraft(i) for i in self.ids]
self.sigmas = np.zeros(len(self.aircraft))
diff --git a/sw/ground_segment/python/gvf/formation/three_aircraft.json b/sw/ground_segment/python/gvf/formation/three_aircraft.json
index 19a59ce321..ff5e38b510 100644
--- a/sw/ground_segment/python/gvf/formation/three_aircraft.json
+++ b/sw/ground_segment/python/gvf/formation/three_aircraft.json
@@ -5,7 +5,7 @@
[-1, 1],
[ 0,-1]
],
- "desired_intervehicle_angles": [0, 0],
+ "desired_intervehicle_angles_degrees": [0, 0],
"gain": 10,
- "desired_stationary_radius": 80
+ "desired_stationary_radius_meters": 80
}
diff --git a/sw/ground_segment/python/gvf/formation/two_aircraft.json b/sw/ground_segment/python/gvf/formation/two_aircraft.json
index bcdc31353f..34038f4909 100644
--- a/sw/ground_segment/python/gvf/formation/two_aircraft.json
+++ b/sw/ground_segment/python/gvf/formation/two_aircraft.json
@@ -4,7 +4,7 @@
[ 1],
[-1]
],
- "desired_intervehicle_angles": [0],
+ "desired_intervehicle_angles_degrees": [0],
"gain": 10,
- "desired_stationary_radius": 80
+ "desired_stationary_radius_meters": 80
}