removed 1061 name collision, made rover mixing explicit to sitl

ROMFS/px4fmu_common/mixers-sitl/CMakeLists.txt

@@ -34,7 +34,8 @@
 px4_add_romfs_files(
 	delta_wing_sitl.main.mix
 	plane_sitl.main.mix
-	rover_sitl.main.mix
+	rover_ackermann_sitl.main.mix
+	rover_diff_sitl.main.mix
 	standard_vtol_sitl.main.mix
 	tiltrotor_sitl.main.mix
 	uuv_x_sitl.main.mix

ROMFS/px4fmu_common/mixers-sitl/rover_ackermann_sitl.main.mix

@@ -0,0 +1,46 @@
+Mixer for SITL rover
+=========================================================
+
+Output 0
+---------------------------------------
+M: 1
+O:       10000   10000      0 -10000  10000
+S: 0 2   10000   10000      0 -10000  10000
+
+Output 1
+---------------------------------------
+M: 1
+O:       10000   10000      0 -10000  10000
+S: 0 2   10000   10000      0 -10000  10000
+
+Output 2
+---------------------------------------
+Z:
+
+Output 3
+---------------------------------------
+Z:
+
+Output 4
+---------------------------------------
+Z:
+
+Output 5
+---------------------------------------
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 3  10000  10000      0 -10000  10000
+
+Output 6
+---------------------------------------
+M: 1
+O:      10000  10000      0 -10000  10000
+S: 0 3  10000  10000      0 -10000  10000
+
+Output 7
+---------------------------------------
+Z:
+
+Output 8
+---------------------------------------
+Z: