Merge branch 'master' of github.com:ctu-mrs/mrs_uav_deployment

config/mrs_uav_system/x4.yaml

@@ -0,0 +1,9 @@
+# Motor thrust curve parameters
+# a - quadratic term
+# b - constant term
+# n_motors - number of motors on the UAV
+
+motor_params:
+  a: 0.193898
+  b: -0.427863
+  n_motors: 4

config/mrs_uav_system/x4_12s.yaml

@@ -0,0 +1,9 @@
+# Motor thrust curve parameters
+# a - quadratic term
+# b - constant term
+# n_motors - number of motors on the UAV
+
+motor_params:
+  a: 0.203293
+  b: -0.667727
+  n_motors: 4

launch/sensors.launch

@@ -106,6 +106,10 @@
         <node pkg="tf2_ros" type="static_transform_publisher" name="$(arg fcu_frame_slashless)_to_$(arg garmin_frame_slashless)" args="-0.19 0 -0.085 0 1.57079632679 0.0 $(arg fcu_frame) $(arg garmin_frame)" />
       </group>
 
+      <group if="$(eval arg('UAV_TYPE') == 'x4_12s')">
+        <node pkg="tf2_ros" type="static_transform_publisher" name="$(arg fcu_frame_slashless)_to_$(arg garmin_frame_slashless)" args="-0.19 0 -0.085 0 1.57079632679 0.0 $(arg fcu_frame) $(arg garmin_frame)" />
+      </group>
+
       <group if="$(eval arg('UAV_TYPE') == 'eaglemk2')">
         <node pkg="tf2_ros" type="static_transform_publisher" name="$(arg fcu_frame_slashless)_to_$(arg garmin_frame_slashless)" args="0.15 0 -0.05 0 1.57079632679 0.0 $(arg fcu_frame) $(arg garmin_frame)" />
       </group>

ssh/david

@@ -0,0 +1,28 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABC/Y4ynor
+TzP8b6nm0OGaSDAAAAEAAAAAEAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQDbCdQv7K24
+DIiD2uEhFdf5Bw3BUyJWVGT0dugaacF2uL49XeQ55ZefoQ3g0n9GwH5z6BtVOzhu/hg8K7
+unz0h3lLIXpXvKszTzbVgRbsWvEjtC2H4rI0ARVmN4TxtzYtZYCJmMRbbx6i0XN5YB/9wc
+/O9U7BYlMg8Op+hlV0MG87hVYPua1JyyX5uhCd9Ciy6E/rLFQVE68H9VVLkaclH/CKXJKV
+5j367X2DkoAg0cFUY7O0FXZQlHFa9U679bZPh7MtlaD+zmYZNbwaJCysI85y7HWqksnh2w
+UptVzj2glnpgGoEaUtWO779QoDNf/Yhyj7oEwvB3BURc7/ulYmJ/AAADwIgyARbQZ761um
+ypRiiZzL5Pf4lyqyvY4ejBIWnDWPsXCt3TjyYNiDLasanWC1nBE8cMhrQw4SCrxSkQ6TMh
+Nbp+ifm1TNIuHlOUeLxU7SbK6YEf48b/XdYQXJodUtQsJWFEc1JWple8ZDZFnHkrYR36QX
+8VJabVydw2VT9c/rb5ZQRPLM159uggZSJUo9RGqUhUqejsXlytHVCZXmJ5HqhkCw+wqJQT
+e3dsAqpQ/moHWrttfzjLj+0MGxV5clqrDAwAYsC//U8MFkeRNE/GvVFCsIhA14zmVrJB/T
+g4xtW1cPAgeutcv7alMuOBqNTLah9PiUFfgdwNP6rStxQSHoqE27nRZ4dKD0pshb0jhcLl
+kdD1TASc0wJ1cutnJuma7tvKTGAwCyn8QlKL83bbAWNKZSPUGAbSrEWbmGezKI2N0mfuDa
+25HW6puu+1t8wl/Ug8MokzT4rmudWPMlnpY1bAiLRDNgjeoydFDylfuuErSlqeiHMg+GgN
+mV1U/+rJ9RpE6iZeALlwPi3uDXVc6mKNGjTzUY9mURmezVf7AZ8rDW/eOIR15TrKAWrXj6
+KH2tQWHflWLZ9j8rcrPC7+Z611cF52TK/+ur/izERbirTx7UQqL2ckYtHrcgq0DheqwVKg
+f9k/ByETChBvXl3d9KY4Luf16oE3+3/+BMRWqsxhD9XjGtBGzp55JX09RHLEQV3QWEpuk2
+3Qc+hBFy2v1lVWQ2avMWkgOsrryKNzCsM59BnYkXvsjbfzh+WruQpAPpurJmD+lbLtrInC
+ZBikax+TiSR5BtNuWB6ErL40PTa0QiVZz8aGXVzy4huWsJ5UGTSsplDVkelf4bXX4aMO3l
+1m8ItC8lW6lEyiyUNUrZqf/sABy3UnwWIVjnoUk2yb4SVdATSvhFNLwjGp80NEJAG6KRPb
+sfXvfUtZjrVOd0KVHO1LOIIs37iEIxLm7F5jH7bXET38YQpucQe9HQd9gKX4CMG6D8VkW/
+oyTZFrDs+SX/WeJ9WT/46sHFbKB+0hRUQsk12uRVhZCy/K5EJ6EohPoKtptXlSOpc389j/
+fTKGQug0Hl/+EvF9mUX3WGSQNEFwoPO5lfC3nkHbO+/44QM/wvFlPOtQCZYTF1jKIb185Q
+Lj3JANBexSIQ5nGpMDUL1J+zajocOt8t0iCwPIIW9YNnT+hpQ9NNOOnojlu1MbLbP3tTzu
+ocEV/0qtH+4pwsRRwAoQP65d0qJkUVusQKWSzy7v9QgSZew9fOfxPlsTH4iNip/7rkjskZ
+LufRY15Q==
+-----END OPENSSH PRIVATE KEY-----

ssh/david.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDbCdQv7K24DIiD2uEhFdf5Bw3BUyJWVGT0dugaacF2uL49XeQ55ZefoQ3g0n9GwH5z6BtVOzhu/hg8K7unz0h3lLIXpXvKszTzbVgRbsWvEjtC2H4rI0ARVmN4TxtzYtZYCJmMRbbx6i0XN5YB/9wc/O9U7BYlMg8Op+hlV0MG87hVYPua1JyyX5uhCd9Ciy6E/rLFQVE68H9VVLkaclH/CKXJKV5j367X2DkoAg0cFUY7O0FXZQlHFa9U679bZPh7MtlaD+zmYZNbwaJCysI85y7HWqksnh2wUptVzj2glnpgGoEaUtWO779QoDNf/Yhyj7oEwvB3BURc7/ulYmJ/ david

ssh/git_usernames

@@ -7,6 +7,7 @@ dan Dan Hert
 jiri Jiri Horyna
 filip Filip Novak
 manuel Manuel Boldrer
-vbakirci Veli Bakircioglu
 ondra Ondrej Prochazka
 novosma Matej Novosad
+david David Capek
+musilto Tomas Musil

ssh/musilto

@@ -0,0 +1,50 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+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
+/zvQ==
+-----END OPENSSH PRIVATE KEY-----

ssh/musilto.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCkcLCiclQfZesx/2XXvZWiB/oZwdB9ohTJ40aNFnGPIr8vuNerDXHndOQSrolByuyJNTpEYfGprasEIC6okCCd4AXEg6tH3tsCo3NW88aKYF+SE6BJLnuRtKU/Mb9yryLAZb0nt3D7k+JJ4Vh7d/OUKPqbL/8yiGocD5tm/gC1B4je37Bl/BBqeDmzwdNS/gJCUPdpziieMqdlhpIgUBep2GVIC+Nr8ncTMukCcbrzN1X02izDBGN7E4GMz5f+8bFm9C8w6TjAkr/UGzHmvIjbMIr3CJRWW5re9JAWciouq9Vw42yW3ucI69pG569XxfPlBKH7o6FpAJ8ILqJgypKC3RRYsA4ZF7PiTQOF9ETOzjColysVod7Vz+VA5jyxTT8wh8sNDYZL0qCxI++nX37eoh2Ae4/A4bzSP65osdPLKYaEHlnlb2JNCCY6s0cfl2fSoNU7zIa8NTaWWsR3zco46hzMlezC5ciuUVIbShrt5EwrPfSY/K7crE44vLuiuDLzG5LE07xmcsy+EUeFsUrc/0tABQhxE1+RwJXunYSxCGdmInoNBhnJcbnmaDI+Wjz20Ib1Tna84p3ACvuxIynNhf99XBgpsngcyanm6VuxyL2zGShJTDdyj/WEYrTcJO4bbRjtpj6kTJViqOtK5VKGdBPu1SuhN5WyIUBZhhMALw== tom@Legion