vpe_publisher: rename parameter publish_zero to force_init

.github/workflows/build.yml

@@ -7,13 +7,13 @@ on:
     branches: [ master ]
 
 jobs:
-  # melodic:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Native Melodic build
-  #       run: |
-  #         docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh
+  melodic:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Native Melodic build
+        run: |
+          docker run --rm -v $(pwd):/root/catkin_ws/src/clover ros:melodic-ros-base /root/catkin_ws/src/clover/builder/standalone-install.sh
   noetic:
     runs-on: ubuntu-latest
     steps:

.github/workflows/docs.yml

@@ -38,11 +38,7 @@ jobs:
          gitbook install
          gitbook build
       - name: Generate PDF
-        id: generate-pdf
-        env:
-          GITBOOK_SKIP_PDF: ${{ secrets.GITBOOK_SKIP_PDF }}
-        continue-on-error: ${{ env.GITBOOK_SKIP_PDF != '' }}
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
         run: |
           for i in 1 2 3 4; do gitbook pdf ./ _book/clover.pdf && break || sleep 1; done
           sudo apt-get -q install ghostscript
@@ -51,13 +47,6 @@ jobs:
           rm _book/clover_ru.pdf && mv _book/clover_ru_compressed.pdf _book/clover_ru.pdf
           rm _book/clover_en.pdf && mv _book/clover_en_compressed.pdf _book/clover_en.pdf
           ls -lah _book/clover*.pdf
-          echo '::set-output name=GITBOOK_PDF_OK::1'
-      - name: Download older PDFs
-        if: ${{ !steps.generate-pdf.outputs.GITBOOK_PDF_OK }}
-        run: |
-          rm _book/clover*.pdf
-          wget --no-verbose https://clover.coex.tech/clover_ru.pdf -P _book/
-          wget --no-verbose https://clover.coex.tech/clover_en.pdf -P _book/
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@4.1.3
         if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}

.gitignore

@@ -7,6 +7,3 @@ package-lock.json
 clover_blocks/programs/*.*
 !clover_blocks/programs/examples/*
 /.vscode/
-docs/.vuepress/.cache/
-docs/.vuepress/.temp/
-docs/.vuepress/dist

aruco_pose/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>aruco_pose</name>
-  <version>0.23.0</version>
+  <version>0.21.1</version>
   <description>Positioning with ArUco markers</description>
 
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

aruco_pose/src/genmap.py

@@ -30,7 +30,7 @@ Options:
   -o <filename>  Output map file name in the 'map' subdirectory of aruco_pose package
 
 Example:
-  rosrun aruco_pose genmap.py 0.33 2 4 1 1 0 -o test_map.txt
+  rosrun aruco_pose genmap.py 0.33 2 4 1 1 0 > $(catkin_find aruco_pose map)/test_map.txt
 """
 
 from __future__ import print_function

builder/image-ros.sh

@@ -90,7 +90,7 @@ echo_stamp "Installing OpenCV 4.2-compatible ROS packages"
 apt install -y --no-install-recommends \
 ros-${ROS_DISTRO}-compressed-image-transport=1.14.0-0buster \
 ros-${ROS_DISTRO}-cv-bridge=1.15.0-0buster \
-ros-${ROS_DISTRO}-cv-camera=0.5.1-0buster \
+ros-${ROS_DISTRO}-cv-camera=0.5.0-0buster \
 ros-${ROS_DISTRO}-image-publisher=1.15.3-0buster \
 ros-${ROS_DISTRO}-web-video-server=0.2.1-0buster
 apt-mark hold \

builder/image-software.sh

@@ -138,7 +138,6 @@ echo_stamp "Install and enable Butterfly (web terminal)"
 echo_stamp "Workaround for tornado >= 6.0 breaking butterfly"
 export CRYPTOGRAPHY_DONT_BUILD_RUST=1
 my_travis_retry pip3 install cryptography==3.4.6 # https://stackoverflow.com/a/68472128/6850197
-my_travis_retry pip3 install pyOpenSSL==20.0.1
 my_travis_retry pip3 install tornado==5.1.1
 my_travis_retry pip3 install butterfly
 my_travis_retry pip3 install butterfly[systemd]

builder/test/tests.sh

@@ -58,9 +58,5 @@ rosversion rosshow
 rosversion nodelet
 rosversion image_view
 
-# validate some versions
-[[ $(rosversion cv_camera) == "0.5.1" ]] # patched version with init fix
-[[ $(rosversion ws281x) == "0.0.12" ]]
-
 # validate examples are present
 [[ $(ls /home/pi/examples/*) ]]

clover/launch/aruco.launch

@@ -8,11 +8,8 @@
 
     <!-- For additional help go to https://clover.coex.tech/aruco -->
 
-    <arg name="force_init" default="false"/>
-    <arg name="disable" default="false"/> <!-- only force init -->
-
     <!-- aruco_detect: detect aruco markers, estimate poses -->
-    <node name="aruco_detect" pkg="nodelet" if="$(eval aruco_detect and not disable)" type="nodelet" args="load aruco_pose/aruco_detect main_camera_nodelet_manager" output="screen" clear_params="true" respawn="true">
+    <node name="aruco_detect" pkg="nodelet" if="$(arg aruco_detect)" type="nodelet" args="load aruco_pose/aruco_detect main_camera_nodelet_manager" output="screen" clear_params="true" respawn="true">
         <remap from="image_raw" to="main_camera/image_raw"/>
         <remap from="camera_info" to="main_camera/camera_info"/>
         <remap from="map_markers" to="aruco_map/markers"/>
@@ -29,7 +26,7 @@
     </node>
 
     <!-- aruco_map: estimate aruco map pose -->
-    <node name="aruco_map" pkg="nodelet" type="nodelet" if="$(eval aruco_map and not disable)" args="load aruco_pose/aruco_map main_camera_nodelet_manager" output="screen" clear_params="true" respawn="true">
+    <node name="aruco_map" pkg="nodelet" type="nodelet" if="$(arg aruco_map)" args="load aruco_pose/aruco_map main_camera_nodelet_manager" output="screen" clear_params="true" respawn="true">
         <remap from="image_raw" to="main_camera/image_raw"/>
         <remap from="camera_info" to="main_camera/camera_info"/>
         <remap from="markers" to="aruco_detect/markers"/>
@@ -44,11 +41,11 @@
     </node>
 
     <!-- vpe publisher from aruco markers -->
-    <node name="vpe_publisher" pkg="clover" type="vpe_publisher" if="$(eval aruco_vpe or force_init)" output="screen" clear_params="true">
-        <remap from="~pose_cov" to="aruco_map/pose" if="$(arg aruco_vpe)"/>
+    <node name="vpe_publisher" pkg="clover" type="vpe_publisher" if="$(arg aruco_vpe)" output="screen" clear_params="true">
+        <remap from="~pose_cov" to="aruco_map/pose"/>
         <remap from="~vpe" to="mavros/vision_pose/pose"/>
-        <param name="frame_id" value="aruco_map_detected" if="$(arg aruco_vpe)"/>
-        <param name="force_init" value="$(arg force_init)"/>
+        <param name="frame_id" value="aruco_map_detected"/>
+        <param name="force_init" value="true"/>
         <param name="offset_frame_id" value="aruco_map"/>
     </node>
 </launch>

clover/launch/clover.launch

@@ -12,7 +12,6 @@
     <arg name="led" default="true"/>
     <arg name="blocks" default="false"/>
     <arg name="rc" default="false"/>
-    <arg name="force_init" value="true"/> <!-- force estimator to init by publishing zero pose -->
 
     <arg name="simulator" default="false"/> <!-- flag that we are operating on a simulated drone -->
 
@@ -34,10 +33,7 @@
     </node>
 
     <!-- aruco markers -->
-    <include file="$(find clover)/launch/aruco.launch" if="$(eval aruco or force_init)">
-        <arg name="force_init" value="$(arg force_init)"/>
-        <arg name="disable" value="$(eval not aruco)"/>
-    </include>
+    <include file="$(find clover)/launch/aruco.launch" if="$(arg aruco)"/>
 
     <!-- optical flow -->
     <node pkg="nodelet" type="nodelet" name="optical_flow" args="load clover/optical_flow main_camera_nodelet_manager" if="$(arg optical_flow)" clear_params="true" output="screen" respawn="true">
@@ -51,6 +47,9 @@
 
     <!-- simplified offboard control -->
     <node name="simple_offboard" pkg="clover" type="simple_offboard" output="screen" clear_params="true">
+        <param name="reference_frames/body" value="map"/>
+        <param name="reference_frames/base_link" value="map"/>
+        <param name="reference_frames/navigate_target" value="map"/>
         <param name="reference_frames/main_camera_optical" value="map"/>
     </node>
 

clover/launch/mavros.launch

@@ -39,7 +39,7 @@
         <rosparam command="load" file="$(find clover)/launch/mavros_config.yaml"/>
 
         <!-- remap rangefinder -->
-        <remap from="mavros/distance_sensor/rangefinder_sub" to="$(arg distance_sensor_remap)" if="$(eval bool(distance_sensor_remap))"/>
+        <remap from="mavros/distance_sensor/rangefinder_sub" to="rangefinder/range"/>
 
         <rosparam param="plugin_whitelist">
             - altitude

clover/launch/mavros_config.yaml

@@ -4,8 +4,8 @@
 startup_px4_usb_quirk: false
 
 conn:
-  heartbeat_rate: 1.0    # send heartbeat rate in Hertz
-  timeout: 10.0          # heartbeat timeout in seconds
+  heartbeat_rate: 1.0    # send hertbeat rate in Hertz
+  timeout: 10.0          # hertbeat timeout in seconds
   timesync_rate: 10.0    # TIMESYNC rate in Hertz (feature disabled if 0.0)
   system_time_rate: 1.0  # send system time to FCU rate in Hertz (disabled if 0.0)
 
@@ -78,9 +78,6 @@ distance_sensor:
       field_of_view: 0.5
   rangefinder_sub:
       subscriber: true
-      id: 1
-      orientation: PITCH_270
-      covariance: 1  # cm
 
 # fake_gps
 fake_gps:

clover/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>clover</name>
-  <version>0.23.0</version>
+  <version>0.21.1</version>
   <description>The Clover package</description>
 
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

clover/src/selfcheck.py

@@ -30,7 +30,6 @@ from visualization_msgs.msg import MarkerArray as VisualizationMarkerArray
 import tf.transformations as t
 from aruco_pose.msg import MarkerArray
 from mavros import mavlink
-import locale
 
 
 # TODO: check attitude is present
@@ -46,8 +45,6 @@ rospy.init_node('selfcheck')
 
 os.environ['ROSCONSOLE_FORMAT']='[${severity}]: ${message}'
 
-# use user's locale to convert numbers, etc
-locale.setlocale(locale.LC_ALL, '')
 
 tf_buffer = tf2_ros.Buffer()
 tf_listener = tf2_ros.TransformListener(tf_buffer)
@@ -198,9 +195,6 @@ def check_fcu():
             failure('no connection to the FCU (check wiring)')
             return
 
-        clover_tag = re.compile(r'-cl[oe]ver\.\d+$')
-        clover_fw = False
-
         # Make sure the console is available to us
         mavlink_exec('\n')
         version_str = mavlink_exec('ver all')
@@ -210,16 +204,11 @@ def check_fcu():
         for line in version_str.split('\n'):
             if line.startswith('FW version: '):
                 info(line[len('FW version: '):])
-            elif line.startswith('FW git tag: '): # only Clover's firmware
-                tag = line[len('FW git tag: '):]
-                clover_fw = clover_tag.search(tag)
-                info(tag)
+            elif line.startswith('FW git tag: '):
+                info(line[len('FW git tag: '):])
             elif line.startswith('HW arch: '):
                 info(line[len('HW arch: '):])
 
-        if not clover_fw:
-            info('not Clover PX4 firmware, check https://clover.coex.tech/firmware')
-
         est = get_param('SYS_MC_EST_GROUP')
         if est == 1:
             info('selected estimator: LPE')
@@ -494,9 +483,6 @@ def check_local_position():
         if not tf_buffer.can_transform('base_link', pose.header.frame_id, rospy.get_rostime(), rospy.Duration(0.5)):
             failure('can\'t transform from %s to base_link (timeout 0.5 s): is TF enabled?', pose.header.frame_id)
 
-        if not tf_buffer.can_transform('body', pose.header.frame_id, rospy.get_rostime(), rospy.Duration(0.5)):
-            failure('can\'t transform from %s to body (timeout 0.5 s)', pose.header.frame_id)
-
     except rospy.ROSException:
         failure('no local position')
 
@@ -641,7 +627,7 @@ def check_cpu_usage():
             continue
         pid, cpu, cmd = process.split('\t')
 
-        if cmd.strip() not in WHITELIST and locale.atof(cpu) > 30:
+        if cmd.strip() not in WHITELIST and float(cpu) > 30:
             failure('high CPU usage (%s%%) detected: %s (PID %s)',
                     cpu.strip(), cmd.strip(), pid.strip())
 
@@ -746,14 +732,6 @@ def check_network():
 
 @check('RPi health')
 def check_rpi_health():
-    try:
-        import shutil
-        total, used, free = shutil.disk_usage('/')
-        if free < 1024 * 1024 * 1024:
-            failure('disk space is less than 1 GB; consider removing logs (~/.ros/log/)')
-    except Exception as e:
-        info('could not check the disk free space: %s', str(e))
-
     # `vcgencmd get_throttled` output codes taken from
     # https://github.com/raspberrypi/documentation/blob/JamesH65-patch-vcgencmd-vcdbg-docs/raspbian/applications/vcgencmd.md#get_throttled
     # TODO: support more base platforms?

clover/src/simple_offboard.cpp

@@ -61,7 +61,6 @@ std::shared_ptr<tf2_ros::TransformBroadcaster> transform_broadcaster;
 std::shared_ptr<tf2_ros::StaticTransformBroadcaster> static_transform_broadcaster;
 
 // Parameters
-string mavros;
 string local_frame;
 string fcu_frame;
 ros::Duration transform_timeout;
@@ -862,9 +861,8 @@ int main(int argc, char **argv)
 	static_transform_broadcaster = std::make_shared<tf2_ros::StaticTransformBroadcaster>();
 
 	// Params
-	nh_priv.param("mavros", mavros, string("mavros")); // for case of using multiple connections
-	nh.param<string>(mavros + "/local_position/tf/frame_id", local_frame, "map");
-	nh.param<string>(mavros + "/local_position/tf/child_frame_id", fcu_frame, "base_link");
+	nh.param<string>("mavros/local_position/tf/frame_id", local_frame, "map");
+	nh.param<string>("mavros/local_position/tf/child_frame_id", fcu_frame, "base_link");
 	nh_priv.param("target_frame", target.child_frame_id, string("navigate_target"));
 	nh_priv.param("setpoint", setpoint.child_frame_id, string("setpoint"));
 	nh_priv.param("auto_release", auto_release, true);
@@ -875,13 +873,6 @@ int main(int argc, char **argv)
 	nh_priv.param<string>("body_frame", body.child_frame_id, "body");
 	nh_priv.getParam("reference_frames", reference_frames);
 
-	// Default reference frames
-	std::map<string, string> default_reference_frames;
-	default_reference_frames[body.child_frame_id] = local_frame;
-	default_reference_frames[fcu_frame] = local_frame;
-	if (!target.child_frame_id.empty()) default_reference_frames[target.child_frame_id] = local_frame;
-	reference_frames.insert(default_reference_frames.begin(), default_reference_frames.end()); // merge defaults
-
 	state_timeout = ros::Duration(nh_priv.param("state_timeout", 3.0));
 	local_position_timeout = ros::Duration(nh_priv.param("local_position_timeout", 2.0));
 	velocity_timeout = ros::Duration(nh_priv.param("velocity_timeout", 2.0));
@@ -896,25 +887,25 @@ int main(int argc, char **argv)
 	arming_timeout = ros::Duration(nh_priv.param("arming_timeout", 4.0));
 
 	// Service clients
-	arming = nh.serviceClient<mavros_msgs::CommandBool>(mavros + "/cmd/arming");
-	set_mode = nh.serviceClient<mavros_msgs::SetMode>(mavros + "/set_mode");
+	arming = nh.serviceClient<mavros_msgs::CommandBool>("mavros/cmd/arming");
+	set_mode = nh.serviceClient<mavros_msgs::SetMode>("mavros/set_mode");
 
 	// Telemetry subscribers
-	auto state_sub = nh.subscribe(mavros + "/state", 1, &handleState);
-	auto velocity_sub = nh.subscribe(mavros + "/local_position/velocity_body", 1, &handleMessage<TwistStamped, velocity>);
-	auto global_position_sub = nh.subscribe(mavros + "/global_position/global", 1, &handleMessage<NavSatFix, global_position>);
-	auto battery_sub = nh.subscribe(mavros + "/battery", 1, &handleMessage<BatteryState, battery>);
-	auto statustext_sub = nh.subscribe(mavros + "/statustext/recv", 1, &handleMessage<mavros_msgs::StatusText, statustext>);
-	auto manual_control_sub = nh.subscribe(mavros + "/manual_control/control", 1, &handleMessage<mavros_msgs::ManualControl, manual_control>);
-	auto local_position_sub = nh.subscribe(mavros + "/local_position/pose", 1, &handleLocalPosition);
+	auto state_sub = nh.subscribe("mavros/state", 1, &handleState);
+	auto velocity_sub = nh.subscribe("mavros/local_position/velocity_body", 1, &handleMessage<TwistStamped, velocity>);
+	auto global_position_sub = nh.subscribe("mavros/global_position/global", 1, &handleMessage<NavSatFix, global_position>);
+	auto battery_sub = nh.subscribe("mavros/battery", 1, &handleMessage<BatteryState, battery>);
+	auto statustext_sub = nh.subscribe("mavros/statustext/recv", 1, &handleMessage<mavros_msgs::StatusText, statustext>);
+	auto manual_control_sub = nh.subscribe("mavros/manual_control/control", 1, &handleMessage<mavros_msgs::ManualControl, manual_control>);
+	auto local_position_sub = nh.subscribe("mavros/local_position/pose", 1, &handleLocalPosition);
 
 	// Setpoint publishers
-	position_pub = nh.advertise<PoseStamped>(mavros + "/setpoint_position/local", 1);
-	position_raw_pub = nh.advertise<PositionTarget>(mavros + "/setpoint_raw/local", 1);
-	attitude_pub = nh.advertise<PoseStamped>(mavros + "/setpoint_attitude/attitude", 1);
-	attitude_raw_pub = nh.advertise<AttitudeTarget>(mavros + "/setpoint_raw/attitude", 1);
-	rates_pub = nh.advertise<TwistStamped>(mavros + "/setpoint_attitude/cmd_vel", 1);
-	thrust_pub = nh.advertise<Thrust>(mavros + "/setpoint_attitude/thrust", 1);
+	position_pub = nh.advertise<PoseStamped>("mavros/setpoint_position/local", 1);
+	position_raw_pub = nh.advertise<PositionTarget>("mavros/setpoint_raw/local", 1);
+	attitude_pub = nh.advertise<PoseStamped>("mavros/setpoint_attitude/attitude", 1);
+	attitude_raw_pub = nh.advertise<AttitudeTarget>("mavros/setpoint_raw/attitude", 1);
+	rates_pub = nh.advertise<TwistStamped>("mavros/setpoint_attitude/cmd_vel", 1);
+	thrust_pub = nh.advertise<Thrust>("mavros/setpoint_attitude/thrust", 1);
 
 	 // Service servers
 	auto gt_serv = nh.advertiseService("get_telemetry", &getTelemetry);

clover/test/basic.py

@@ -33,29 +33,3 @@ def test_web_video_server(node):
         # Python 3
         import urllib.request as urllib
     urllib.urlopen("http://localhost:8080").read()
-
-def test_blocks(node):
-    rospy.wait_for_service('clover_blocks/run', timeout=5)
-    rospy.wait_for_service('clover_blocks/stop', timeout=5)
-    rospy.wait_for_service('clover_blocks/load', timeout=5)
-    rospy.wait_for_service('clover_blocks/store', timeout=5)
-
-    from std_msgs.msg import String
-    from clover_blocks.srv import Run
-
-    def wait_print():
-        try:
-            wait_print.result = rospy.wait_for_message('clover_blocks/print', String, timeout=5).data
-        except Exception as e:
-            wait_print.result = str(e)
-
-    import threading
-    t = threading.Thread(target=wait_print)
-    t.start()
-    rospy.sleep(0.1)
-
-    run = rospy.ServiceProxy('clover_blocks/run', Run)
-    assert run(code='print("test")').success == True
-
-    t.join()
-    assert wait_print.result == 'test'

clover/test/basic.test

@@ -23,7 +23,10 @@
 
     <node pkg="tf2_ros" type="static_transform_publisher" name="map_flipped_frame" args="0 0 0 3.1415926 3.1415926 0 map map_flipped" required="true"/>
 
-    <node name="simple_offboard" pkg="clover" type="simple_offboard" required="true" output="screen"/>
+    <node name="simple_offboard" pkg="clover" type="simple_offboard" required="true" output="screen">
+        <param name="reference_frames/body" value="map"/>
+        <param name="reference_frames/base_link" value="map"/>
+    </node>
 
     <node name="tf2_web_republisher" pkg="tf2_web_republisher" type="tf2_web_republisher" required="true"/>
 
@@ -35,8 +38,6 @@
         <rosparam param="notify">startup: { r: 255, g: 255, b: 255 }</rosparam>
     </node>
 
-    <node name="clover_blocks" pkg="clover_blocks" type="clover_blocks" output="screen" required="true"/>
-
     <param name="test_module" value="$(find clover)/test/basic.py"/>
     <test test-name="basic_test" pkg="ros_pytest" type="ros_pytest_runner"/>
 </launch>

clover/www/console.html

@@ -1,23 +0,0 @@
-<h1>
-	/var/log/clover.log
-	<a style="font-size: 0.5em; vertical-align: super; font-weight: normal" href="clover.log" download>download</a>
-</h1>
-
-<pre></pre>
-
-<script type="module">
-	var pre = document.querySelector('pre');
-
-	fetch('clover.log?' + Math.random()).then(function(response) { // random to forbid caching
-		if (response.status == 404) {
-			pre.innerHTML = '/var/log/clover.log does not exist';
-			return;
-		} else if (response.status !== 200) {
-			pre.innerHTML('Error ' + response.status);
-			return;
-		}
-		response.text().then(function(content) {
-			pre.innerHTML = content;
-		});
-	});
-</script>

clover/www/index.html

@@ -9,7 +9,7 @@
 	<li><a href="" id="butterfly">Open web terminal</a> (<code>Butterfly</code>)</li>
 	<li>View <a href="viz.html">View 3D visualization</a>, <a href="aruco_map.html">3D visualization for markers map</a> (<code>ros3djs</code>)</li>
 	<li><a href="../clover_blocks/">Blocks programming</a> (<code>Blockly</code>)</li>
-	<li><a href="console.html">Clover console</a> (<code>/var/log/clover.log</code>)</li>
+	<li><a href="clover.log">Clover console</a> (<code>/var/log/clover.log</code>)</li>
 </ul>
 
 <div class="version"></div>

clover/www/js/topics.js

@@ -1,6 +1,5 @@
 const url = 'ws://' + location.hostname + ':9090';
 const ros = new ROSLIB.Ros({ url: url });
-const params = Object.fromEntries(new URLSearchParams(window.location.search).entries());
 
 ros.on('connection', function () {
 	document.body.classList.add('connected');
@@ -53,15 +52,6 @@ function viewTopic(topic) {
 	new ROSLIB.Topic({ ros: ros, name: topic }).subscribe(function(msg) {
 		document.title = topic;
 		if (mouseDown) return;
-
-		if (msg.header.stamp) {
-			if (params.date || params.offset) {
-				let date = new Date(msg.header.stamp.secs * 1e3 + msg.header.stamp.nsecs * 1e-6);
-				if (params.date) msg.header.date = date.toISOString();
-				if (params.offset) msg.header.offset = (new Date() - date) * 1e-3;
-			}
-		}
-
 		topicMessage.innerHTML = yamlStringify(msg); // JSON.stringify(msg, null, 4);
 	});
 }
@@ -72,6 +62,8 @@ topicMessage.addEventListener('mousedown', function() { mouseDown = true; });
 topicMessage.addEventListener('mouseup', function() { mouseDown = false; });
 
 function init() {
+	const params = Object.fromEntries(new URLSearchParams(window.location.search).entries());
+
 	if (!params.topic) {
 		viewTopicsList();
 	} else {

clover/www/topics.html

@@ -23,6 +23,6 @@
 	<body>
 		<h1>&nbsp;</h1>
 		<ul id="topics"></ul>
-		<code id="topic-message">No messages received</code>
+		<code id="topic-message" title="Hold mouse button to pause">No messages received</code>
 	</body>
 </html>

clover_blocks/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>clover_blocks</name>
-  <version>0.23.0</version>
+  <version>0.21.1</version>
   <description>Blockly programming support for Clover</description>
   <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>
   <license>MIT</license>

clover_description/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>clover_description</name>
-  <version>0.23.0</version>
+  <version>0.21.1</version>
   <description>The clover_description package provides URDF models of the Clover series of quadcopters.</description>
 
   <maintainer email="sfalexrog@gmail.com">Alexey Rogachevskiy</maintainer>

clover_description/urdf/clover/clover4_physics.xacro

@@ -35,7 +35,7 @@
   <xacro:property name="sqrt2" value="1.4142135623730951" />
   <xacro:property name="rotor_drag_coefficient" value="1.75e-04" />
   <xacro:property name="rolling_moment_coefficient" value="0.000001" />
-  <xacro:property name="color" value="DarkGrey" />
+  <xacro:property name="color" value="$(arg visual_material)" />
 
   <!-- Property Blocks -->
   <!-- Clover body inertia -->

clover_description/urdf/leds/led_strip.xacro

@@ -64,12 +64,6 @@
         <!-- <gazebo>
             <static>true</static>
         </gazebo> -->
-        <gazebo>
-            <plugin name="${name}_ros_controller" filename="libsim_leds_controller.so">
-                <robotNamespace></robotNamespace>
-                <ledCount>${led_count}</ledCount>
-            </plugin>
-        </gazebo>
     </xacro:macro>
 
 </robot>

clover_simulation/CMakeLists.txt

@@ -37,14 +37,6 @@ target_compile_options(sim_leds PRIVATE -std=c++11)
 
 add_dependencies(sim_leds ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
 
-add_library(sim_leds_controller src/sim_leds_controller.cpp)
-
-target_include_directories(sim_leds_controller PRIVATE ${catkin_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS})
-target_link_libraries(sim_leds_controller PRIVATE ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
-target_compile_options(sim_leds_controller PRIVATE -std=c++11)
-
-add_dependencies(sim_leds_controller ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
-
 # Gazebo throttling camera plugin
 # for some reason, CMake does not support per-target link directories, and Gazebo does not put
 # CameraPlugin into ${GAZEBO_LIBRARIES}

clover_simulation/airframes/4500_clover

@@ -21,7 +21,7 @@ param set LPE_VIS_Z 0.1
 param set LPE_FUSION 86
 
 param set SENS_FLOW_ROT 0
-param set SENS_FLOW_MINHGT 0.0
+param set SENS_FLOW_MINHGT 0.01
 param set SENS_FLOW_MAXHGT 4.0
 param set SENS_FLOW_MAXR 10.0
 

clover_simulation/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
     <name>clover_simulation</name>
-    <version>0.23.0</version>
+    <version>0.21.1</version>
     <description>The clover_simulation package provides worlds and launch files for Gazebo.</description>
 
     <maintainer email="okalachev@gmail.com">Oleg Kalachev</maintainer>

clover_simulation/src/sim_leds.cpp

@@ -49,9 +49,14 @@ private:
 
 	std::unique_ptr<ros::NodeHandle> nh;
 
+	ros::ServiceServer setLedsSrv;
+	// Note: LED state should only be published by the /gazebo node
+	led_msgs::LEDStateArray ledState;
+	ros::Publisher statePublisher;
 	// LED state will be read from the topic to avoid creating more services
 	ros::Subscriber stateSubscriber;
 
+	bool setLeds(led_msgs::SetLEDs::Request& req, led_msgs::SetLEDs::Response& resp);
 	void handleLedsMsg(const led_msgs::LEDStateArrayConstPtr& leds);
 
 public:
@@ -68,8 +73,16 @@ public:
 		ROS_INFO_NAMED(("LedController_" + robotNamespace).c_str(), "LedController has started (as %s)", role == Role::Client ? "client" : "server");
 
 		nh.reset(new ros::NodeHandle(robotNamespace));
-
-		stateSubscriber = nh->subscribe<led_msgs::LEDStateArray>("led/state", 1, &LedController::handleLedsMsg, this);
+		if (role == Role::Server)
+		{
+			setLedsSrv = nh->advertiseService("led/set_leds", &LedController::setLeds, this);
+			statePublisher = nh->advertise<led_msgs::LEDStateArray>("led/state", 1, true);
+		}
+		else
+		{
+			// LED state should be published to the "led/state" topic, so we grab our data there
+			stateSubscriber = nh->subscribe<led_msgs::LEDStateArray>("led/state", 1, &LedController::handleLedsMsg, this);
+		}
 	};
 
 	~LedController()
@@ -83,9 +96,13 @@ public:
 		std::lock_guard<std::mutex> lock(registryMutex);
 		if (totalLeds > 0) {
 			registeredLeds.resize(totalLeds);
+			ledState.leds.resize(totalLeds);
 		}
 		ROS_DEBUG_NAMED(("LedController_" + robotNamespace).c_str(), "Registering LED visual plugin to %s (LED id=%d)", (role == Role::Client) ? "client" : "server", ledIdx);
 		registeredLeds[ledIdx] = plugin;
+		ledState.leds[ledIdx].index = ledIdx;
+		if (role == Role::Server)
+			statePublisher.publish(ledState);
 	}
 
 	void unregisterPlugin(sim_led::LedVisualPlugin* plugin)
@@ -140,8 +157,7 @@ public:
 		{
 			auto indexStr = parentName.substr(lastDashPos + 1);
 			try {
-				if (indexStr == "visual") myIndex = 0; // the first visual doesn't have index
-				else myIndex = std::stoi(indexStr);
+				myIndex = std::stoi(indexStr);
 			} catch(const std::exception &e) {
 				gzwarn << "Failed to convert " << indexStr << " to integer: " << e.what() <<  ", assuming 0\n";
 				myIndex = 0;
@@ -179,6 +195,26 @@ public:
 };
 }
 
+// FIXME: These two functions basically do the same thing, maybe they can be merged?
+bool led_controller::LedController::setLeds(led_msgs::SetLEDs::Request &req, led_msgs::SetLEDs::Response &resp)
+{
+	std::lock_guard<std::mutex> lock(registryMutex);
+	for(const auto& led : req.leds)
+	{
+		if (led.index < registeredLeds.size()) {
+			auto color = GazeboColor(led.r / 255.0f, led.g / 255.0f, led.b / 255.0f);
+			auto ledPlugin = registeredLeds[led.index];
+			if (ledPlugin) ledPlugin->SetColor(color);
+			ledState.leds[led.index].r = led.r;
+			ledState.leds[led.index].g = led.g;
+			ledState.leds[led.index].b = led.b;
+		}
+	}
+	statePublisher.publish(ledState);
+	resp.success = true;
+	return true;
+}
+
 void led_controller::LedController::handleLedsMsg(const led_msgs::LEDStateArrayConstPtr& leds)
 {
 	std::lock_guard<std::mutex> lock(registryMutex);

clover_simulation/src/sim_leds_controller.cpp

@@ -1,71 +0,0 @@
-#include <led_msgs/SetLEDs.h>
-#include <led_msgs/LEDStateArray.h>
-
-#include <ros/ros.h>
-
-#include <gazebo/gazebo.hh>
-#include <gazebo/physics/physics.hh>
-#include <gazebo/common/common.hh>
-
-class LedControllerPlugin : public gazebo::ModelPlugin {
-private:
-	std::unique_ptr<ros::NodeHandle> nh;
-	std::string ns;
-	ros::ServiceServer setLedsSrv;
-	led_msgs::LEDStateArray ledState;
-	ros::Publisher statePublisher;
-	std::mutex handleMutex;
-
-public:
-	bool setLeds(led_msgs::SetLEDs::Request &req, led_msgs::SetLEDs::Response &resp)
-	{
-		std::lock_guard<std::mutex> lock(handleMutex);
-		for(const auto& led : req.leds)
-		{
-			if (led.index < ledState.leds.size()) {
-				ledState.leds[led.index].r = led.r;
-				ledState.leds[led.index].g = led.g;
-				ledState.leds[led.index].b = led.b;
-			}
-		}
-		statePublisher.publish(ledState);
-		resp.success = true;
-		return true;
-	}
-
-	virtual void Load(gazebo::physics::ModelPtr model, sdf::ElementPtr sdf) override
-	{
-		ROS_INFO("Initialize LED Controller");
-
-		// We need "libgazebo_ros_api.so" to be loaded
-		if (!ros::isInitialized())
-		{
-			ROS_FATAL_NAMED("LedController", "Tried to load ROS plugin when ROS Gazebo API is not loaded. Please use gazebo_ros node to"
-			                                 "launch Gazebo.");
-		}
-
-		ns = "";
-
-		if (sdf->HasElement("robotNamespace")) {
-			ns = sdf->Get<std::string>("robotNamespace");
-		}
-		if (!sdf->HasElement("ledCount")) {
-			gzerr << "ledCount is not set, but is required for the plugin to function correctly\n";
-			return;
-		}
-		int totalLeds = sdf->Get<int>("ledCount");
-		ledState.leds.resize(totalLeds);
-		for (int i = 0; i < totalLeds; i++) {
-			ledState.leds[i].index = i;
-		}
-
-		nh.reset(new ros::NodeHandle(ns));
-
-		setLedsSrv = nh->advertiseService("led/set_leds", &LedControllerPlugin::setLeds, this);
-		statePublisher = nh->advertise<led_msgs::LEDStateArray>("led/state", 1, true);
-
-		statePublisher.publish(ledState);
-	}
-};
-
-GZ_REGISTER_MODEL_PLUGIN(LedControllerPlugin);

docs/.vuepress/config.js

@@ -1,83 +0,0 @@
-const sidebar = require('./sidebar');
-
-const hostname = 'https://clover.coex.tech/';
-const allowedTags = ['font', 'center', 'nobr']; // allow using some deprecated and non-standard html tags
-
-module.exports = {
-	lang: 'en-US',
-	title: 'Clover',
-	description: 'Clover Drone Kit',
-	// theme and its config
-	theme: '@vuepress/theme-default',
-	themeConfig: {
-		logo: 'clover-logo.png',
-		sidebar: {
-			'/ru/': sidebar.readSummary("./ru/SUMMARY.md"),
-			'/en/': sidebar.readSummary("./en/SUMMARY.md"),
-		},
-		sidebarDepth: 0,
-		locales: {
-			'/en/': {
-				selectLanguageName: 'English',
-				navbar: [
-					{ text: 'Official Site', link: 'https://coex.tech' },
-					{ text: 'Support Chat', link: 'https://t.me/COEXHelpdesk' },
-				]
-			},
-			'/ru/': {
-				selectLanguageName: 'Русский',
-				tip: 'СОВЕТ',
-				warning: 'ВНИМАНИЕ',
-				danger: 'ОПАСНО',
-				toggleDarkMode: 'Переключить темную тему',
-				navbar: [
-					{ text: 'Сайт', link: 'https://coex.tech' },
-					{ text: 'Чат поддержки', link: 'https://t.me/COEXHelpdesk' },
-				]
-			},
-		},
-		toggleSidebar: true,
-		repo: 'CopterExpress/clover',
-		docsBranch: 'master',
-		docsDir: 'docs',
-		lastUpdated: false,
-		contributors: false
-	},
-	pagePatterns: ['**/*.md', '!.vuepress', '!node_modules', '!ru/metodmaterials.md'],
-	locales: {
-		'/en/': {
-			lang: 'en',
-			title: 'Clover',
-			description: 'Clover Drone Kit'
-		},
-		'/ru/': {
-			lang: 'ru',
-			title: 'Клевер',
-			description: 'Конструктор квадрокоптера «Клевер»'
-		}
-	},
-	markdown: {
-		code: {
-			lineNumbers: false
-		},
-		linkify: true,
-	},
-	extendsMarkdown(md) {
-		md.use(require('markdown-it-attrs')); // to use custom headers anchors
-	},
-	bundlerConfig: {
-		vuePluginOptions: {
-			template: {
-				compilerOptions: {
-					isCustomElement: tag => allowedTags.includes(tag)
-				}
-			}
-		}
-	},
-	plugins: [
-		'@vuepress/plugin-search',
-		'vuepress-plugin-copy-code2',
-		['sitemap2', { hostname, excludeUrls: ['/', '/LANGS.html'] }],
-		require('./rich-quotes')
-	]
-}

docs/.vuepress/rich-quotes.js

@@ -1,37 +0,0 @@
-// Plugin to convert GitBook rich quotes to custom containers
-
-const types = {
-	info: 'tip',
-	note: 'tip',
-	tag: 'tip',
-	comment: 'tip',
-	hint: 'tip',
-	success: 'tip',
-	warning: 'warning',
-	caution: 'warning',
-	danger: 'danger',
-	quote: 'tip'
-}
-
-function replace(src) {
-	return src.replace(/^> \*\*(.*?)\*\* (.*\n(>.*\n)*)/gm, function (match, type, text) {
-		text = text.replace(/^>/gm, '');
-		return `::: ${types[type.toLowerCase()]}\n${text}\n:::`;
-	});
-}
-
-module.exports = {
-	name: 'vuepress-plugin-rich-quotes',
-	extendsMarkdown: (md) => {
-		var _render = md.render;
-
-		// TODO: a rough hack to replace rich quotes
-		// TODO: use proper plugin api
-
-		md.render = function(src, env) {
-			src = replace(src);
-			return _render.call(md, src, env);
-		}
-	},
-	
-};

docs/.vuepress/sidebar.js

@@ -1,50 +0,0 @@
-const fs = require('fs')
-
-const regex = /(\s*?)\*\s\[(.*?)\]\((.*?)\)/;
-
-exports.readSummary = function (path) {
-	let sidebar = [];
-	let lines = fs.readFileSync(path).toString().split('\n');
-	let item = {};
-
-	for (let line of lines) {
-		if (line.startsWith('#')) continue;
-		if (!line.trim()) continue;
-
-		let match = regex.exec(line);
-		if (!match) {
-			console.log('cannot parse', line);
-			continue;
-		}
-		level = match[1].length / 2;
-		text = match[2];
-		path = match[3].trim();
-
-		if (level == 0) {
-			if (item.path) {
-				// push new item
-				if (item.children) {
-					sidebar.push(item);
-				} else {
-					sidebar.push(item.path)
-				}
-				item = {};
-			}
-			item.text = text;
-			item.path = path;
-			item.collapsible = true;
-
-		} else if (level == 1 || level == 2) {
-			if (!item.children) {
-				item.children = [];
-				if (item.path) item.children.push(item.path);
-			}
-			item.children.push(path);
-
-		} else {
-			console.log('skip', text);
-		}
-	}
-
-	return sidebar;
-}

docs/.vuepress/styles/index.scss

@@ -1,49 +0,0 @@
-.big-clover {
-	max-width: 80% !important;
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-/* change image for dark theme */
-html .big-clover.dark { display: none; }
-html.dark .big-clover { display: none; }
-html.dark .big-clover.dark { display: block; }
-
-img.logo {
-	transform: scale(2.5) translateX(-5%);
-}
-
-/* Centered images */
-img.center {
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-/* Images with border */
-img.border {
-	border: 1px #e9e9e9 solid;
-	border-radius: 5px;
-}
-
-html.dark img.border {
-	border: none;
-	background: #fffffa;
-}
-
-table.versions td {
-	text-align: center;
-	background: white;
-}
-table.versions .subversion {
-	font-size: 80%;
-}
-
-.circle {
-	width: 0.8em;
-	height: 0.8em;
-	border-radius: 50%;
-	display: inline-block;
-	margin-right: 0.5em;
-}

docs/README.md

@@ -1,4 +0,0 @@
-# Languages
-
-* [English](en/)
-* [Русский](ru/)

docs/en/README.md

@@ -1,7 +1,6 @@
 # COEX Clover
 
-<img class="big-clover light" src="../assets/clover42-main.png" alt="Clover 4.2">
-<img class="big-clover dark" src="../assets/clover42-black.png" alt="Clover 4.2">
+<img class="center zoom big-clover" src="../assets/clover42-main.png" width="80%" alt="Clover 4.2">
 
 **Clover** is an educational kit of a programmable quadcopter that consists of popular open source components, and a set of necessary documentation and libraries for working with it.
 

docs/en/SUMMARY.md

@@ -17,6 +17,7 @@
   * [Power setup](power.md)
   * [Failsafe configuration](failsafe.md)
 * [Manual flight](flight.md)
+  * [Basics](flight.md)
   * [Exercises](flight_exercises.md)
 * [Working with Raspberry Pi](raspberry.md)
   * [RPi Image](image.md)
@@ -49,7 +50,6 @@
     * [Native setup](simulation_native.md)
     * [VM setup](simulation_vm.md)
     * [Usage](simulation_usage.md)
-    * [Setup on M1 computers](simulation_m1.md)
   * [ROS](ros.md)
   * [MAVROS](mavros.md)
 * [Supplementary materials](supplementary.md)
@@ -70,7 +70,7 @@
   * [Remote control app](rc.md)
   * [Wi-Fi Configuration](network.md)
   * [UART settings](uart.md)
-  * [PX4 Parameters](parameters.md)
+  * [PX4 Parameters](px4_parameters.md)
   * [PX4 Logs and Topics](flight_logs.md)
   * [PX4 Firmware](firmware.md)
   * [MAVLink](mavlink.md)
@@ -101,7 +101,6 @@
   * [CopterHack-2018](copterhack2018.md)
   * [CopterHack-2017](copterhack2017.md)
   * [Video contest](video_contest.md)
-  * [Educational contests](educational_contests.md)
 * [Clover-based projects](projects.md)
   * [Autonomous Multirotor Landing System (AMLS)](amls.md)
   * [Drone show](clever-show.md)

docs/en/android.md

@@ -49,7 +49,7 @@ This feature allows getting rid of the system interface elements. Let's go ahead
 
 This is how the transmitter looks at this stage:
 
-<img src="../assets/IMG_4397.png" width="50%">
+<img src="../assets/IMG_4397.PNG" width="50%">
 
 If you run your application, you will see that the sticks are not functioning. This is due to the fact that *JavaScript* is disabled in our page. To enable it, write the following code:
 

docs/en/aruco_map.md

@@ -93,7 +93,7 @@ The marker map adheres to the [ROS coordinate system convention](http://www.ros.
 
 ## VPE setup
 
-In order to enable vision position estimation you should use the following [PX4 parameters](parameters.md).
+In order to enable vision position estimation you should use the following [PX4 parameters](px4_parameters.md).
 
 If you're using **LPE** (`SYS_MC_EST_GROUP` parameter is set to `local_position_estimator,attitude_estimator_q`):
 
@@ -152,7 +152,7 @@ If the drone's altitude is not stable, try increasing the `MPC_Z_VEL_P` paramete
 
 ## Placing markers on the ceiling
 
-![Ceiling markers](../assets/IMG_4175.jpg)
+![Ceiling markers](../assets/IMG_4175.JPG)
 
 In order to navigate using markers on the ceiling, mount the onboard camera so that it points up and [adjust the camera frame accordingly](camera_setup.md).
 

docs/en/aruco_marker.md

@@ -113,3 +113,7 @@ rospy.spin()
 ```
 
 Each message contains the marker ID, its corner points on the image and its position relative to the camera.
+
+---
+
+Suggested reading: [map-based navigation](aruco_map.md)

docs/en/assemble_2.md

@@ -341,7 +341,7 @@ should be increased up to 4 – 5.
 
 ### ESC assembly
 
-1. Stick the double-sided adhesive tape to the base of the ESC protective case.
+1. Stick the double-sided adhesive tape to the base of the ESC protective case ![Adhesive tape on the ESC case](../assets/escCase.png)
 2. Put the ESCs into protective cases. Fasten the assembly to the motor mounts of the frame. ![ESC cases top view](../assets/topESCcaseview.png)
 
 ### Installation of guard

docs/en/assemble_3.md

@@ -36,7 +36,7 @@ TODO
 
     Cut the remaining part of the clamp (cable tie) with scissors.
 
-    ![Preparation of motors](../assets/en/cl3_prepareMotors.jpg)
+    ![Preparation of motors](../assets/en/cl3_prepareMotors.JPG)
 
 ## Frame elements installation
 
@@ -45,7 +45,7 @@ TODO
 3. Attach the assembled unit to the frame with M3x16 screws, complying with the layout.
 4. Install the frame for the LED strip, using the slots in the leg holders.
 
-![Legs installation on the frame](../assets/en/cl3_mountElements.jpg)
+![Legs installation on the frame](../assets/en/cl3_mountElements.JPG)
 
 ## BEC voltage converter installation(to be soldered and tested)
 
@@ -93,7 +93,7 @@ TODO
             Black -> GND
             Blue -> Din
 
-![Installation of the BEC voltage Converter](../assets/en/cl3_mountBEC.jpg)
+![Installation of the BEC voltage Converter](../assets/en/cl3_mountBEC.JPG)
 
 ## 4 in 1 ESC board and the PDB power-board installation
 
@@ -108,7 +108,7 @@ TODO
 3. Install the PDB power distribution board as shown in the picture (the XT60 connector should point to the tail of the drone).
 4. Connect the wires of the PCB power supply board and ESC XT30 board.
 
- ![Power board installation](../assets/cl3_mountESC.jpg)
+ ![Power board installation](../assets/cl3_mountESC.JPG)
 
 ## Pairing the receiver and transmitter
 
@@ -125,7 +125,7 @@ TODO
     * Remove the BIND connector from the receiver.
     * Disconnect the battery.
 
-![Pairing the receiver and the remote](../assets/cl3_bindFlysky.jpg)
+![Pairing the receiver and the remote](../assets/cl3_bindFlysky.JPG)
 
 > **Hint** If the remote cannot be powered on, or is blocked, see
 article [remote faults](radioerrors.md).
@@ -145,7 +145,7 @@ article [remote faults](radioerrors.md).
 4. Check the motor rotation direction according to the scheme. Repeat for each motor. Thus, it will be clear which motor is controlled.
 5. If you have to change the rotation direction, swap any two phase wires of the motor (needs re-connection).
 
-![Checking the motors rotation direction](../assets/cl3_testMotorsFlysky.jpg)
+![Checking the motors rotation direction](../assets/cl3_testMotorsFlysky.JPG)
 
 ## Installation and connection of the Pixracer flight controller
 
@@ -162,7 +162,7 @@ article [remote faults](radioerrors.md).
 
 4. Connect the ribbon cable from the radio receiver to the RCIN connector in Pixracer.
 
-![Installation of the flight controller](../assets/cl3_mountPixracer.jpg)
+![Installation of the flight controller](../assets/cl3_mountPixracer.JPG)
 
 ## Raspberry installation
 
@@ -186,7 +186,7 @@ article [remote faults](radioerrors.md).
 
     Use an M3x16 screw and an M3 nut
 
-![Installation of Raspberry Pi Model B](../assets/cl3_mountRaspberryPi.jpg)
+![Installation of Raspberry Pi Model B](../assets/cl3_mountRaspberryPi.JPG)
 
 ## Arduino and FlySky radio receiver installation
 
@@ -200,7 +200,7 @@ article [remote faults](radioerrors.md).
         black -> GND
         orange, green -> currently not used. They are set to the unused pins of the radio receiver.
 
-![Arduino and FlySky radio receiver installation](../assets/cl3_mountArduinoandFlysky.jpg)
+![Arduino and FlySky radio receiver installation](../assets/cl3_mountArduinoandFlysky.JPG)
 
 ## RPi camera installation
 
@@ -213,7 +213,7 @@ article [remote faults](radioerrors.md).
 
 5. Install the legs into the mounts (4 pcs).
 
-![Mounting the RPi camera](../assets/en/cl3_mountRpiCamera.jpg)
+![Mounting the RPi camera](../assets/en/cl3_mountRpiCamera.JPG)
 
 ## Installation of the remaining structural elements
 
@@ -223,13 +223,13 @@ article [remote faults](radioerrors.md).
 
     Secure the upper deck with M3x8 screws (4 pcs.)
 
-![Installation of the remaining structural elements](../assets/cl3_mountOtherElements.jpg)
+![Installation of the remaining structural elements](../assets/cl3_mountOtherElements.JPG)
 
 ## USB connectors installation
 
 1. Connect Pixracer to Raspberry using the micro USB - USB cable.
 2. Connect Arduino to Raspberry using the micro USB - USB cable.
 
-![USB connectors installation](../assets/cl3_mountUSBconnectors.jpg).
+![USB connectors installation](../assets/cl3_mountUSBconnectors.JPG).
 
 Read more about connection in [article](connection.md).

docs/en/autolaunch.md

@@ -6,7 +6,7 @@ Software autorun
 systemd
 ---
 
-Main documentation: https://wiki.archlinux.org/title/Systemd.
+Main documentation: [https://wiki.archlinux.org/title/Systemd](https://wiki.archlinux.org/title/Systemd).
 
 All automatically started Clover software is launched as a `clover.service` systemd service.
 
@@ -54,8 +54,8 @@ The started file must have *permission* to run:
 chmod +x my_program.py
 ```
 
-When scripting languages are used, a <a href="https://en.wikipedia.org/wiki/Shebang_(Unix)">shebang</a> should be placed at the beginning of the file, for example:
+When scripting languages are used, a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) should be placed at the beginning of the file, for example:
 
 ```bash
-#!/usr/bin/env python3
+#!/usr/bin/env python
 ```

docs/en/blocks.md

@@ -49,7 +49,7 @@ The rest of categories contains standard Blockly's blocks.
 
 ### take_off
 
-<img src="../assets/blocks/take-off.png" srcset="@source/assets/blocks/take-off.png 2x">
+<img src="../assets/blocks/take-off.png" srcset="../assets/blocks/take-off.png 2x">
 
 Take off to specified altitude in meters. The altitude may be an arbitrary block, that returns a number.
 
@@ -57,7 +57,7 @@ The `wait` flag specifies, if the drone should wait until take off is complete,
 
 ### navigate
 
-<img src="../assets/blocks/navigate.png" srcset="@source/assets/blocks/navigate.png 2x">
+<img src="../assets/blocks/navigate.png" srcset="../assets/blocks/navigate.png 2x">
 
 Navigate to specified point. Coordinates are specified in meters.
 
@@ -77,7 +77,7 @@ This block allows to specify the [coordinate frame](frames.md) of the target poi
 
 ### land
 
-<img src="../assets/blocks/land.png" srcset="@source/assets/blocks/land.png 2x">
+<img src="../assets/blocks/land.png" srcset="../assets/blocks/land.png 2x">
 
 Land the drone.
 
@@ -85,31 +85,31 @@ The `wait` flag specifies, if the drone should wait until landing is complete, b
 
 ### wait
 
-<img src="../assets/blocks/wait.png" srcset="@source/assets/blocks/wait.png 2x">
+<img src="../assets/blocks/wait.png" srcset="../assets/blocks/wait.png 2x">
 
 Wait specified time period in seconds. The time period may be an arbitrary block, that returns a number.
 
 ### wait_arrival
 
-<img src="../assets/blocks/wait-arrival.png" srcset="@source/assets/blocks/wait-arrival.png 2x">
+<img src="../assets/blocks/wait-arrival.png" srcset="../assets/blocks/wait-arrival.png 2x">
 
 Wait, until the drone reaches [navigate](#navigate)-block's target point.
 
 ### get_position
 
-<img src="../assets/blocks/get-position.png" srcset="@source/assets/blocks/get-position.png 2x">
+<img src="../assets/blocks/get-position.png" srcset="../assets/blocks/get-position.png 2x">
 
 The block returns current position, velocity or yaw angle of the drone relative to the specified [coordinate frame](#relative_to).
 
 ### set_effect
 
-<img src="../assets/blocks/set-effect.png" srcset="@source/assets/blocks/set-effect.png 2x">
+<img src="../assets/blocks/set-effect.png" srcset="../assets/blocks/set-effect.png 2x">
 
 The block allows to set animations to LED strip, similarly to [`set_effect`](leds.md#set_effect) ROS-service.
 
 Example of using the block with a random color (colors-related blocks are located in *Colour* category):
 
-<img src="../assets/blocks/random-color.png" srcset="@source/assets/blocks/random-color.png 2x">
+<img src="../assets/blocks/random-color.png" srcset="../assets/blocks/random-color.png 2x">
 
 ### Work with GPIO {#GPIO}
 

docs/en/calibration.md

@@ -14,7 +14,7 @@ In order to perform the sensor calibration, select the *Vehicle Setup* tab and c
 4. Put the drone in one of the orientations marked by the red outline and wait for the appropriate outline to turn yellow.
 5. Spin the drone as required until the outline turns green. Do this for all orientations.
 
-Read more in the PX4 docs: https://docs.px4.io/master/en/config/compass.html.
+Read more in the PX4 docs: https://docs.px4.io/v1.9.0/en/config/compass.html.
 
 ## Gyroscope
 
@@ -27,7 +27,7 @@ Read more in the PX4 docs: https://docs.px4.io/master/en/config/compass.html.
 
 > **Warning** The drone should stay completely still during the calibration.
 
-Read more in the PX4 docs: https://docs.px4.io/master/en/config/gyroscope.html.
+Read more in the PX4 docs: https://docs.px4.io/v1.9.0/en/config/gyroscope.html.
 
 ## Accelerometer
 
@@ -38,7 +38,7 @@ Read more in the PX4 docs: https://docs.px4.io/master/en/config/gyroscope.html.
 3. Put the drone in one of the orientations marked by the red outline and wait for the appropriate outline to turn yellow.
 4. Hold the drone in this orientation until the outline turns green. Do this for all orientations.
 
-Read more in the PX4 docs: https://docs.px4.io/master/en/config/accelerometer.html.
+Read more in the PX4 docs: https://docs.px4.io/v1.9.0/en/config/accelerometer.html.
 
 ## Level horizon
 
@@ -50,4 +50,6 @@ Read more in the PX4 docs: https://docs.px4.io/master/en/config/accelerometer.ht
 4. Press *OK*.
 5. Wait for the calibration to finish.
 
-Read more in the PX4 docs: https://docs.px4.io/master/en/config/level_horizon_calibration.html.
+Read more in the PX4 docs: https://docs.px4.io/v1.9.0/en/config/level_horizon_calibration.html.
+
+**Next**: [RC setup](radio.md).

docs/en/coex_pix.md

@@ -1,6 +1,6 @@
 # COEX Pix
 
-The **COEX Pix** flight controller is a modified [Pixracer](https://docs.px4.io/master/en/flight_controller/pixracer.html) FCU. It is a part of the **Clover 4** quadrotor kit.
+The **COEX Pix** flight controller is a modified [Pixracer](https://docs.px4.io/v1.9.0/en/flight_controller/pixracer.html) FCU. It is a part of the **Clover 4** quadrotor kit.
 
 > **Hint** The source files of the COEX Pix flight controller are [published](https://github.com/CopterExpress/hardware/tree/master/COEX%20Pix) under the CC BY-NC-SA license.
 

docs/en/connection.md

@@ -16,7 +16,7 @@ USB connection is the preferred way to connect to the flight controller.
 
     The `connected` field should have the `True` value.s
 
-> **Hint** You need to set the `CBRK_USB_CHK` [parameter](parameters.md) to 197848 for the USB connection to work.
+> **Hint** You need to set the `CBRK_USB_CHK` [parameter](px4_parameters.md) to 197848 for the USB connection to work.
 
 ## UART connection
 
@@ -50,3 +50,5 @@ In order to connect to a local or a remote [SITL](sitl.md) instance set the `fcu
 <arg name="fcu_conn" default="udp"/>
 <arg name="fcu_ip" default="127.0.0.1"/>
 ```
+
+**Next**: [Using QGroundControl over Wi-Fi](gcs_bridge.md)

docs/en/copterhack2022.md

@@ -12,24 +12,24 @@ The proposed projects have to be open-source and be compatible with the Clover q
 
 |Place|Team|Project|Points|
 |:-:|-|-|-|
+||🇰🇬 Alatoo University Team|[Облачная платформа для симулятора Клевера](https://github.com/pteacher/clover/blob/clover_simulator/docs/ru/clover-development-studio.md)||
 ||🇧🇾 FTL|[Advanced Clover 2](https://github.com/FTL-team/clover/blob/FTL-advancedClover2/docs/ru/advanced_clover_simulator.md)||
 ||🇷🇺 Stereo|[Neural obstacle avoidance](https://github.com/den250400/clover/blob/neural-obstacle-avoidance/docs/en/neural-obstacle-avoidance.md)||
 ||🇷🇺 Space clowns|[Copter For Space](https://github.com/slavikyd/clover/blob/patch-3/docs/ru/c4s.md)||
 ||🇷🇺 R.S.|[Drone Hawk](https://github.com/slavaroot/clover/blob/droneHawkSecurity/docs/ru/drone-hawk-security.md)||
 ||🇲🇾 Moopt|[IoT Water Monitoring & Optimization](https://github.com/kafechew/clover/blob/master/docs/en/moopt-uav.md)||
 ||🇧🇷 Atena - Grupo SEMEAR|[Swarm in Blocks](https://github.com/Grupo-SEMEAR-USP/clover/blob/Swarm_in_Blocks/docs/en/swarm_in_blocks.md)||
+||🇷🇺 Clevertron|[Clevertron](https://github.com/Daniel-drone/clover/blob/Clevertron-1/docs/ru/clevertron.md)||
 ||🇷🇺 Clover Rescue Team|[Rescue Clover](https://github.com/DevMBS/clover/blob/CloverRescueTeam/docs/ru/clover-rescue-team.md)||
+||🇵🇱 Edgenoon|[Neural and vision-based landing method](https://github.com/edgenoon-ai/clover/blob/neural_vision_based_landing_method/docs/en/neural_vision_based_landing_method.md)||
 ||🇷🇺 CopterCat|[CopterCat](https://github.com/matveylapin/clover/blob/CopterCat/docs/ru/сopter_сat.md)||
 ||🇷🇺 Дрой Ронов|[Clover Swarm](https://github.com/stinger000/clever/blob/clover_swarm_request/docs/ru/clover-swarm.md)||
+||🇩🇪 Inondro|[Inondro Pix](https://github.com/Inondro/clover/blob/inondro-pix/docs/en/inondro_copterhack22_pix.md)||
 ||🇮🇳 DJS Phoenix|[Autonomous valet parking drone assistance](https://github.com/DJSPhoenix/clover/blob/DJSPhoenix-Ikshana/docs/en/djs_phoenix_ikshana.md)||
 ||🇷🇺 SPECTRE|[SPECTRE](https://github.com/alakhmenev/clover/blob/spectre_team/docs/ru/spectre_team.md)||
+||🇷🇺 SolidEye|[Разработка лидара без движущихся частей](https://github.com/feanorgg/clover/blob/solideye/docs/ru/solid_eye.md)||
+||🇰🇬 AI_U_CLOVER|[AIU_CLOVER](https://github.com/zhibekm/clover/blob/zhibekm-patch-1/docs/en/aiu-article.md)||
 ||🇷🇺 С305|[Система мониторинга воздуха](https://github.com/Ruslan2288/clover/blob/master/docs/ru/air_monitor.md)| |
-|✕|🇰🇬 Alatoo University Team|[Облачная платформа для симулятора Клевера](https://github.com/pteacher/clover/blob/clover_simulator/docs/ru/clover-development-studio.md)||
-|✕|🇷🇺 Clevertron|[Clevertron](https://github.com/Daniel-drone/clover/blob/Clevertron-1/docs/ru/clevertron.md)||
-|✕|🇵🇱 Edgenoon|[Neural and vision-based landing method](https://github.com/edgenoon-ai/clover/blob/neural_vision_based_landing_method/docs/en/neural_vision_based_landing_method.md)||
-|✕|🇩🇪 Inondro|[Inondro Pix](https://github.com/Inondro/clover/blob/inondro-pix/docs/en/inondro_copterhack22_pix.md)||
-|✕|🇷🇺 SolidEye|[Разработка лидара без движущихся частей](https://github.com/feanorgg/clover/blob/solideye/docs/ru/solid_eye.md)||
-|✕|🇰🇬 AI_U_CLOVER|[AIU_CLOVER](https://github.com/zhibekm/clover/blob/zhibekm-patch-1/docs/en/aiu-article.md)||
 |✕|🇻🇳 Dragon&Tanker|[Dragon&Tanker](https://github.com/uml4/clover/blob/drone_observe_autonomous_car/docs/en/dragon_and_tanker_team.md)||
 |✕|🇷🇺 V-NAV|[Visual Navigation](https://github.com/v-nav/clover/blob/v-nav_article/docs/ru/v-nav.md)||
 |✕|🇷🇺 Джедаи 1581|[Ретранслятор на базе Клевера](https://github.com/JJNIK/clover/blob/patch-1/docs/ru/1581.md)||

docs/en/ddrone.md

@@ -10,9 +10,9 @@ People strive to teach artificial intelligence everything they can do themselves
 
 ## Models and assembly
 
-<img class="center zoom" src="../assets/ddrone/full_holder.png" width="300">
+<img class="center" src="../assets/ddrone/full_holder.png" width="300" class="zoom">
 
-<img class="center zoom" src="../assets/ddrone/full_holder_in_real.jpg" width="300">
+<img class="center" src="../assets/ddrone/full_holder_in_real.jpg" width="300" class="zoom">
 
 To complete the project you need to have in stock:
 
@@ -43,9 +43,9 @@ If the diameter of the can is less than the diameter of the holder, we use the p
 
 **Pressing mechanism.** To push the valve, we will use a screw drive with a fixed nut. A bar with holes will be attached to the servo, which will include the racks attached to the nut. This helps the servo to move only on one axis, up and down. We also modeled the cap for the spray can button, since the surface of the nozzle is uneven.
 
-<img class="center zoom" src="../assets/ddrone/pressing_mechanism.png" width="300">
+<img class="center" src="../assets/ddrone/pressing_mechanism.png" width="300" class="zoom">
 
-<img class="center zoom" src="../assets/ddrone/pressing_mechanism_in_real.jpg" width="300">
+<img class="center" src="../assets/ddrone/pressing_mechanism_in_real.jpg" width="300" class="zoom">
 
 ## Before launching
 
@@ -81,11 +81,11 @@ Now to open the web interface, click on the link [http://192.168.11.1/clover/dro
 
 Our drone is launched via [website](https://perizatkurmanbaeva.github.io/visual_ddrone). The web interface allows you to draw and encode what you draw in G-code. The coordinate data will be transmitted for further processing and execution by the copter.
 
-<img class="center zoom" src="../assets/ddrone/screen_2.png" width="600">
+<img class="center" src="../assets/ddrone/screen_2.png" width="600" class="zoom">
 
 We pick the web interface to control the copter because it is easier for the user.
 
-<img class="center zoom" src="../assets/ddrone/instruction.png" width="300">
+<img class="center" src="../assets/ddrone/instruction.png" width="300" class="zoom">
 
 ## Flights
 

docs/en/educational_contests.md

@@ -1,118 +0,0 @@
-# Educational contests
-
-## 1. Contest for the best educational lecture {#lecture}
-
-The Copter Express company organizes a contest for the best educational lecture with COEX Clover 4 quadcopter kit application.
-
-The main goal of the contest is aerial robotics popularization  and community development.
-
-### Lecture requirements
-
-* The topic of the lecture is of free choice. Programmable quadcopter kit COEX Clover 4 and/or The Clover simulation environment should be used as the main tool in the lecture.
-  > **Note** *The version of COEX Clover is not earlier than [version 4](https://clover.coex.tech/en/assemble_4.html). The virtual machine image is not earlier than [version 1.0](https://github.com/CopterExpress/clover_vm/releases/tag/v1.0).
-* The video is uploaded on YouTube or another public platform and is public accessible.
-* The language of the lecture is any. The video contains subtitles in English in case the language is made neither of English nor Russian.
-* The duration of the lecture is limited from 15 min. to 3 hours.
-
-### Requirements for the participants
-
-* The participant must be the author of the lesson.
-* Third parties can provide technical support for recording a lecture.
-* The status of the participant is unlimited (student, representative of a general education institution, representative of the industry, amateur).
-
-Applications deadline: September 1, 2022.
-
-### How to apply?
-
-The application to the contest is performed via the [Google Form](https://docs.google.com/forms/d/e/1FAIpQLScE2kN5dO2OYNSM8hOYzOa5Qvh2uDdd9Fjx8OnL1W93bfEBgw/viewform) where the link to the video lecture should be attached.
-
-Participants who are the authors of the lecture are allowed to participate in the competition.
-
-### Prizes
-
-Based on the results of the submitted application, the jury selects the winners of the competition. The quality of the video, it is content, and audience engagement are assessed.
-
-* 1st place: $500.
-* 2nd place: $400.
-* 3rd place: $300.
-* 4th place: $200.
-* 5th place: $100.
-
-## 2. Contest for the best school lesson {#lesson}
-
-The Copter Express company organizes a contest for the best school lesson with COEX Clover 4 quadcopter kit application.
-
-The main goal of the contest is aerial robotics popularization  and community development.
-
-### Lesson requirements
-
-* Programmable quadcopter kit COEX Clover 4 should be used as the main tool for the lesson.
-  > **Note** *The version of COEX Clover is not earlier than [version 4](https://clover.coex.tech/en/assemble_4.html).
-* Integration of the quadcopter into any of the general education disciplines (physics, mathematics, computer science, etc.).
-* Practical use of the main tool in the lesson.
-* Grade - no restrictions (primary, high school).
-* Lesson duration is 30-45 minutes.
-* Lesson format - offline.
-* The video of the lesson was filmed in the classroom of a general education institution.
-
-### Requirements for the participants
-
-* The participant must be the author of the lesson.
-* The participant must be a teacher of a general education institution
-
-### How to apply?
-
-The application to the contest is performed via the [Google Form](https://docs.google.com/forms/d/e/1FAIpQLSdelVy6yQ1iN6u88KeiEIKGj7gGaM0xccSt2tiYKB46ICmjkQ/viewform).
-
-Applications deadline: September 1, 2022.
-
-### Prizes
-
-Based on the results of the submitted application, the jury selects the winners of the competition. The video and material quality are assessed.
-
-* 1st place: $500.
-* 2nd place: $400.
-* 3rd place: $300.
-* 4th place: $200.
-* 5th place: $100.
-
-## 3. Contest for the best online course {#course}
-
-The Copter Express company organizes a contest for the best online course with COEX Clover 4 quadcopter kit application.
-
-The main goal of the contest is aerial robotics popularization  and community development.
-
-The course is evaluated according to a separate, publicly available lesson submitted for the contest.
-
-### Course requirements
-
-* The course is related to the direction of Aerial robotics.
-* Programmable quadcopter kit COEX Clover 4 and/or The Clover simulation environment should be used as the main tool in the course;
-  > **Note** *The version of COEX Clover is not earlier than [version 4](https://clover.coex.tech/en/assemble_4.html). The virtual machine image is not earlier than [version 1.0](https://github.com/CopterExpress/clover_vm/releases/tag/v1.0).
-* The course is located on a public platform (e.g., Coursera).
-* The course can be either paid or free of charge. One public lesson from the course is submitted for the competition;
-* The lesson submitted for the contest should be publicly accessible.
-* The language of the lesson is any. The video contains subtitles in English in case the language is made neither of English nor Russian (if there is a video in the lesson).
-* The duration of the course and lesson is not limited.
-
-### Requirements for the participants
-
-* The participant must be the author of the course.
-* Third parties can provide technical support for preparing a course.
-* The status of the participant is unlimited (student, representative of a general education institution, representative of the industry, amateur).
-
-### How to apply?
-
-The application to the contest is performed via the [Google Form](https://docs.google.com/forms/d/e/1FAIpQLSdf2Q68X4hPnFE9f3EP95AxPNnzHKqIsFHtTRT6EBKiH93wzg/viewform) where the link to the video course should be attached.
-
-Applications deadline: September 1, 2022.
-
-### Prizes
-
-Based on the results of the submitted application, the members of the Commission select the winners of the competition. The quality of the material, the format of the presentation of the material, the total volume and content of the course are assessed.
-
-* 1st place: $1000.
-* 2nd place: $800.
-* 3rd place: $600.
-* 4th place: $400.
-* 5th place: $200.

docs/en/failsafe.md

@@ -4,10 +4,10 @@ Main article is available at https://docs.px4.io/master/en/config/safety.html.
 
 The *Safety* panel allows you to configure actions that should be performed when a failsafe is triggered. You should at the very least configure the RC Loss failsafe, which is triggered when the RC transmitter link is lost:
 
-1. In QGroundControl software, go to the *Vehicle Setup* panel and choose the *Safety* menu.
+1. Open the *Safety* panel.
 2. Select one of the following actions in the *RC Loss Failsafe Trigger* option:
     * *Land mode* – transition to automatic land mode;
     * *Terminate* – set all outputs to their failsafe values.
-3. Set the timeout value before RC Loss triggers in the *RC Loss Timeout* field. We recommend setting it to 2 s.
+3. Set the timeout value before RC Loss triggers in the *RC Loss Timeout* field. We recommend setting it to 0.5 s.
 
 <img src="../assets/qgc-failsafe.png" alt="QGroundControl failsafe" class="zoom">

docs/en/firmware.md

@@ -77,19 +77,19 @@ PX4 may be compiled from the source and automatically flashed to the flight cont
 To do this, clone the PX4 repository:
 
 ```bash
-git clone https://github.com/PX4/PX4-Autopilot.git
+git clone https://github.com/PX4/Firmware.git
 ```
 
 Select the appropriate version (tag) using `git checkout`. Then compile and upload the firmware:
 
-```bash
-make px4_fmu-v4_default upload
+```
+make px4fmu-v4_default upload
 ```
 
-Where `px4_fmu-v4_default` is the required firmware variant.
+Where `px4fmu-v4_default` is the required firmware variant.
 
 In order to upload the `v3` firmware to Pixhawk, you may need to use the `force_upload` option:
 
-```bash
-make px4_fmu-v3_default force-upload
+```
+make px4fmu-v3_default force-upload
 ```

docs/en/flight.md

@@ -1,6 +1,6 @@
 # Flight
 
-> **Info** See also official PX4 flying guide: https://docs.px4.io/master/en/flying/.
+> **Info** See also official PX4 flying guide: https://docs.px4.io/v1.9.0/en/flying/.
 
 This section explains the basics of manual controlling the quadcopter in different modes using radio remote control (for autonomous flying see "[Programming](programming.md)") section.
 
@@ -106,3 +106,5 @@ When the *Kill Switch* is activated, no control signals are sent to the motors a
 > **Caution** Be careful, *Kill Switch* does not put the copter into *Disarmed* state!
 
 Before disabling the *Kill Switch*, make sure the throttle stick is its down position and the aircraft is in *Disarmed* state. If the throttle stick is not in the lower position, when the *Kill Switch* is turned off, a signal corresponding to the stick position will be sent to the motors, which will lead your copter to jerk.
+
+**Next**: [Drone control exercises](flight_exercises.md).

docs/en/frames.md

@@ -9,8 +9,7 @@ Main frames in the `clover` package:
 * `base_link` is rigidly bound to the drone. It is shown by the simplified drone model on the image above;
 * `body` is bound to the drone, but its Z axis points up regardless of the drone's pitch and roll. It is shown by the red, blue and green lines in the illustration;
 * <a name="navigate_target"></a>`navigate_target` is bound to the current navigation target (as set by the [navigate](simple_offboard.md#navigate) service);
-* `setpoint` is current position setpoint;
-* `main_camera_optical` is the coordinate system, [linked to the main camera](camera_setup.md#frame);
+* `setpoint` is current position setpoint.
 
 Additional frames become available when [ArUco positioning system](aruco.md) is active:
 

docs/en/gcs_bridge.md

@@ -67,3 +67,5 @@ Change parameter `gcs_bridge` in the launch file:
 ```
 
 After opening the QGroundControl application, the connection should be established automatically.
+
+**Next**: [Remote access using SSH](ssh.md)

docs/en/generative_design_frame.md

@@ -43,14 +43,14 @@ After printing the first version of the frame we discovered the following proble
 
 To conquer those problems we made several changes. We increased the minimal thickness for the generated structures and generated a new model. We changed the settings in the slicer so that the support structure could be removed easier as well as changed the infill structure. Finally we changed the filament and increased the printing temperature. Further we concluded that printing with a water dissolvable support structure would be optimal, however as of right now we don’t have access to a printer capable of that.
 
-![Prototype 1](../assets/generative-design-frame/p1.jpg)
+![Prototype 1](../assets/generative-design-frame/p1.JPG)
 
 #### Prototype 2
 
 This prototype took 48 hours of printing and used 277 grams of filament including 100 grams for the support. Installation of the components is very easy as no other tools than a screwdriver are needed. This prototype was the first to take flight in January 2021. Please see [this](https://youtu.be/M4f8_JmJADM) video.
 
 <p float="left">
-  <img src="../assets/generative-design-frame/p21.jpg" width="32%" class="zoom"/>
+  <img src="../assets/generative-design-frame/p21.JPG" width="32%" class="zoom"/>
   <img src="../assets/generative-design-frame/p22.jpg" width="32%" class="zoom"/>
   <img src="../assets/generative-design-frame/p23.jpg" width="32%" class="zoom"/>
 </p>
@@ -73,7 +73,7 @@ Videos:
 
 In this final prototype we have changed the preserved geometry on the bottom to form a rectangle for added stability. We have also changed some of the forces on the points we observed breakings in our previous tests. We have also updated the prop guard to make it more stable and increased the area around the screws, so it would break harder. The frame without the prop guard weighs only 150g making it significantly lighter than the default frame.
 
-![final prototype](../assets/generative-design-frame/f.jpg)
+![final prototype](../assets/generative-design-frame/f.JPG)
 
 ### Benefits
 

docs/en/image.md

@@ -15,3 +15,5 @@ The RPi image for Clover contains all the necessary software for working with Cl
 <img src="../assets/etcher.png" class="zoom">
 
 After flashing the image on the MicroSD-card, you can [connect to the Clover over Wi-Fi](wifi.md), use [wireless connection in QGroundControl](gcs_bridge.md), gain access to the Raspberry [over SSH](ssh.md) and use all the other features.
+
+**Next:** [Connecting over Wi-Fi](wifi.md).

docs/en/laser.md

@@ -38,7 +38,7 @@ rostopic echo /rangefinder/range
 
 > **Hint** We recommend using our [custom PX4 firmware for Clover](firmware.md#modified-firmware-for-clover) for best laser rangefinder support.
 
-PX4 should be properly [configured](parameters.md) to use the rangefinder data.
+PX4 should be properly [configured](px4_parameters.md) to use the rangefinder data.
 
 Set the following parameters when EKF2 is used (`SYS_MC_EST_GROUP` = `ekf2`):
 
@@ -75,7 +75,7 @@ from sensor_msgs.msg import Range
 
 # ...
 
-dist = rospy.wait_for_message('rangefinder/range', Range).range
+data = rospy.wait_for_message('rangefinder/range', Range)
 ```
 
 ### Data visualization

docs/en/leds.md

@@ -158,9 +158,3 @@ Current LED strip state is published in the `/led/state` ROS topic. You can view
 ```bash
 rostopic echo /led/state
 ```
-
-Using the same topic you can get the configured number os LEDs, using Python:
-
-```python
-led_count = len(rospy.wait_for_message('led/state', LEDStateArray, timeout=10).leds)
-```

docs/en/magnetic_grip.md

@@ -63,64 +63,3 @@ Then connect the signal output of the circuit to the selected port and solder th
 2. Use a zip tie to pull the assembled circuit to the back of the deck.
 3. Plug the Arduino *D11* signal pin into one of the *AUX* pins on the flight controller.
 4. Plug the power wire of the electromagnetic gripper to JST 5V.
-
-## Setting up electromagnetic gripper
-
-To control the magnet through Arduino Nano, use the following code:
-
-```cpp
-void setup() {
-  pinMode(11, INPUT);
-  pinMode(13, OUTPUT);
-}
-
-void loop() {
-  if (int duration = pulseIn(11, HIGH) > 1200) {
-    digitalWrite(13, HIGH);
-  } else {
-    digitalWrite(13, LOW);
-  }
-}
-```
-
-To monitor the status of the electromagnetic gripper, you can connect the *ws281x* LED strip (included to Clover kit). Connect it to power +5v – 5v, ground GND – GND, and signal wire DIN – Arduino D12.
-
-To control the magnet and monitor it using the LED strip, use the following code:
-
-```cpp
-#include <Adafruit_NeoPixel.h>
-#define NUMPIXELS 72
-#define PIN 12
-int pin = 11;
-int led = 13;
-
-unsigned long duration;
-Adafruit_NeoPixel strip (NUMPIXELS, PIN, NEO_GRB + NEO_KHZ800);
-
-void setup() {
-  strip.begin();
-  strip.setBrightness(10);
-  Serial.begin(9600);
-  pinMode(pin, INPUT);
-  pinMode(led, OUTPUT);
-}
-
-void loop() {
-  duration = pulseIn(pin, HIGH);
-  Serial.println(duration);
-  delay(100);
-  if (duration >= 1500) {
-    digitalWrite(led, HIGH);
-    for (int i = -1; i < NUMPIXELS; i++) {
-      strip.setPixelColor(i, strip.Color(255, 0, 0));
-      strip.show();
-    }
-  } else {
-    digitalWrite(led, LOW);
-    for (int i = -1; i < NUMPIXELS; i++) {
-      strip.setPixelColor(i, strip.Color(0, 255, 0));
-      strip.show();
-    }
-  }
-}
-```

docs/en/mechanical_grip.md

@@ -56,13 +56,13 @@
 12. Install the assembled grip onto the aircraft from below.
 
     <div class="image-group">
-        <img src="../assets/mechanical_grip/mech_grip_15.png" width=300 class="zoom border">
         <img src="../assets/mechanical_grip/mech_grip_16.png" width=300 class="zoom border">
+        <img src="../assets/mechanical_grip/mech_grip_17.png" width=300 class="zoom border">
     </div>
 
 13. Insert the servo cable into the *AUX* 1-2 output on the flight controller.
 
-    <img src="../assets/mechanical_grip/mech_grip_17.png" width=300 class="zoom border center">
+    <img src="../assets/mechanical_grip/mech_grip_18.png" width=300 class="zoom border center">
 
 14. Go to the *Radio* tab to control capture with the remote control.
 15. In the *AUX 1/2 Passthrough RC channel* parameter, select the desired channel.

docs/en/modes.md

@@ -4,11 +4,10 @@ PX4 **mode** determines how the vehicle should react to commands and RC signals.
 
 In order to configure flight modes:
 
-1. Open the *Vehicle Setup* panel in QGroundControl.
+1. Open the *Vehicle Setup* tab in QGroundControl.
 2. Select the *Flight Modes* menu.
-3. Set the *Mode Channel* to the SwC switch (*Channel 6*).
-4. Optionally, set the *Emergency Kill Switch Channel* to SwA switch (*Channel 5*).
-5. Set desired flight modes.
+3. Choose SwC (Channel 6) as mode selection switch.
+4. Set desired flight modes.
 
     The following flight modes are recommended:
 
@@ -16,8 +15,8 @@ In order to configure flight modes:
     * Flight Mode 4: *Altitude*.
     * Flight Mode 6: *Position*.
 
-6. Check mode switching by changing the switch position.
-7. Choose SwA (Channel 5) as emergency motor stop (*Kill switch*).
+5. Check mode switching by changing the switch position.
+6. Choose SwA (Channel 5) as emergency motor stop (*Kill switch*).
 
 <img src="../assets/qgc-modes.png" class="zoom" alt="QGroundControl modes">
 
@@ -46,3 +45,5 @@ In autonomous flight modes the quadcopter ignores the control signals from the t
 * **AUTO.LAND** – the copter lands at the current position.
 
 Additional information: https://dev.px4.io/en/concept/flight_modes.html.
+
+**Next**: [Power setup](power.md).

docs/en/optical_flow.md

@@ -1,10 +1,12 @@
 # Use of Optical Flow
 
-Running the "Optical Flow" function offers the possibility of POSCTL flight mode, and autonomous flight operating on a camera pointed downwards that detects changes of ground texture.
+Running the technology "Optical Flow" offers the possibility of POSCTL flight mode, and autonomous flight operating on a camera pointed downwards that detects changes of ground texture.
 
 ## Enabling
 
-> **Hint** For Optical Flow to work it's required that the laser rangefinder is [connected and configured](laser.md).
+> **Hint** It is recommended to use [special PX4 firmware for Clover](firmware.md).
+
+The use of a rangefinder is essential. [Connect and setup laser-ranging sensor VL53L1X](laser.md), according to the manual.
 
 Enable Optical Flow in the file `~/catkin_ws/src/clover/clover/launch/clover.launch`:
 
@@ -12,7 +14,7 @@ Enable Optical Flow in the file `~/catkin_ws/src/clover/clover/launch/clover.lau
 <arg name="optical_flow" default="true"/>
 ```
 
-Optical Flow publishes data in `/mavros/px4flow/raw/send` topic. In the topic `/optical_flow/debug` is also published a visualization, that can be viewed with [web_video_server](web_video_server.md).
+Optical Flow publishes data in `mavros/px4flow/raw/send` topic. In the topic `optical_flow/debug` is also published a visualization, that can be viewed with [web_video_server](web_video_server.md).
 
 > **Info** Correct connection and [setup](camera.md) of the camera module is needed for proper functioning.
 
@@ -29,7 +31,7 @@ When using **EKF2** (parameter `SYS_MC_EST_GROUP` = `ekf2`):
 * `EKF2_OF_N_MAX` - 0.2.
 * `SENS_FLOW_ROT` – No rotation.
 * `SENS_FLOW_MAXHGT` – 4.0 (for the rangefinder VL53L1X)
-* `SENS_FLOW_MINHGT` – 0.0 (for the rangefinder VL53L1X)
+* `SENS_FLOW_MINHGT` – 0.01 (for the rangefinder VL53L1X)
 * Optional: `EKF2_HGT_MODE` – range sensor (cf. [rangefinder setup](laser.md)).
 
 When using **LPE** (parameter `SYS_MC_EST_GROUP` = `local_position_estimator, attitude_estimator_q`):
@@ -41,7 +43,7 @@ When using **LPE** (parameter `SYS_MC_EST_GROUP` = `local_position_estimator, at
 * `LPE_FLW_RR` – 0.0.
 * `SENS_FLOW_ROT` – No rotation.
 * `SENS_FLOW_MAXHGT` – 4.0 (for the rangefinder VL53L1X)
-* `SENS_FLOW_MINHGT` – 0.0 (for the rangefinder VL53L1X)
+* `SENS_FLOW_MINHGT` – 0.01 (for the rangefinder VL53L1X)
 * Optional: `LPE_FUSION` – flag 'pub agl as lpos down' is on (see [rangefinder setup](laser.md).
 
 [The `selfcheck.py` utility](selfcheck.md) will help you verify that all settings are correctly set.

docs/en/parameters.md

@@ -1,112 +0,0 @@
-# PX4 Parameters
-
-Full documentation on PX4 parameters: https://docs.px4.io/master/en/advanced_config/parameter_reference.html.
-
-For changing PX4 parameters, use QGroundControl software, [connect to Clover over Wi-Fi](gcs_bridge.md) or USB. Go to *Vehicle Setup* panel (click on the QGroundControl logo in the top-left corner) and choose *Parameters* menu.
-
-## Recommended values
-
-### Common parameters
-
-|Parameter|Value|Comment|
-|-|-|-|
-|`SENS_FLOW_ROT`|0 (*No rotation*)|If using *PX4Flow* hardware, keep the default value|
-|`SENS_FLOW_MINHGT`|0.0|For [VL53L1X](laser.md) rangefinder|
-|`SENS_FLOW_MAXHGT`|4.0|For [VL53L1X](laser.md) rangefinder|
-|`SENS_FLOW_MAXR`|10.0||
-|`SYS_HAS_MAG`|0|If impossible to run the magnetometer (*No mags found* error)|
-
-### Estimator subsystem parameters
-
-In case of using LPE ([COEX patched firmware](firmware.md)):
-
-|Parameter|Value|Comment|
-|-|-|-|
-|`LPE_FUSION`|86|Checkboxes: *flow* + *vis* + *land Detector* + *gyro comp*. If flying over horizontal floor *pub agl as lpos down* checkbox is allowed.<br>Details: [Optical Flow](optical_flow.md), [ArUco markers](aruco_map.md), [GPS](gps.md).|
-|`LPE_VIS_DELAY`|0.0||
-|`LPE_VIS_Z`|0.1||
-|`LPE_FLW_SCALE`|1.0||
-|`LPE_FLW_R`|0.2||
-|`LPE_FLW_RR`|0.0||
-|`LPE_FLW_QMIN`|10||
-|`ATT_W_EXT_HDG`|0.5|Enabling usage of external yaw angle (when navigating using [markers map](aruco_map.md))|
-|`ATT_EXT_HDG_M`|1 (*Vision*)||
-|`ATT_W_MAG`|0|Disabling usage of the magnetometer (when navigating indoor)|
-
-In case of using EKF2 (official firmware):
-
-<!-- markdownlint-disable MD044 -->
-
-|Parameter|Value|Comment|
-|-|-|-|
-|`EKF2_AID_MASK`|27|Checkboxes: (optionally) *gps* + *flow* + *vision position* + *vision yaw*.<br>Details: [Optical Flow](optical_flow.md), [ArUco markers](aruco_map.md), [GPS](gps.md).|
-|`EKF2_OF_DELAY`|0||
-|`EKF2_OF_QMIN`|10||
-|`EKF2_OF_N_MIN`|0.05||
-|`EKF2_OF_N_MAX`|0.2||
-|`EKF2_HGT_MODE`|2 (*Range sensor*)|If the [rangefinder](laser.md) is present and flying over horizontal floor|
-|`EKF2_EVA_NOISE`|0.1||
-|`EKF2_EVP_NOISE`|0.1||
-|`EKF2_EV_DELAY`|0||
-|`EKF2_MAG_TYPE`|5 (*None*)|Disabling usage of the magnetometer (when navigating indoor)|
-
-<!-- markdownlint-enable MD031 -->
-
-> **Info** See also: list of default parameters of the [Clover simulator](simulation.md): https://github.com/CopterExpress/clover/blob/master/clover_simulation/airframes/4500_clover.
-
-## Additional information
-
-The `SYS_MC_EST_GROUP` parameter defines the estimator subsystem to use.
-
-Estimator subsystem is a group of modules that calculates the current state of the copter using readings from the sensors. The copter state includes:
-
-* Angle rate of the copter – pitch_rate, roll_rate, yaw_rate;
-* Copter orientation (in the local coordinate system) – pitch, roll, yaw (one of presentations);
-* Copter position (in the local coordinate system) – x, y, z;
-* Copter speed (in the local coordinate system) – vx, vy, vz;
-* Global coordinates of the copter – latitude, longitude, altitude;
-* Altitude above the surface;
-* Other parameters (the drift of gyroscopes, wind speed, etc.).
-
-`SYS_AUTOCONFIG` — resets all parameters (sets to 1).
-
-## EKF2
-
-`EKF2_AID_MASK` — selects sensors that are used by EKF2 to calculate the copter state.
-
-`EKF2_HGT_MODE` is the main source of height data (z in the local coordinate system):
-
-* 0 – pressure reading on the barometer.
-* 1 – GPS.
-* 2 – distance meter (for example, vl53l1x).
-* 3 – data from VPE.
-
-Variant 2 is the most accurate; however, it is correct to use it only if the surface the copter flies over is flat. Otherwise, the Z axis origin will move up and down with the altitude of the surface.
-
-## Multicopter Position Control
-
-These parameters adjust the flight of the copter by position (POSCTL, OFFBOARD, AUTO modes).
-
-`MPC_THR_HOVER` — hovering throttle. This option is to set to the approximate percentage of throttle needed to make the copter maintain its altitude. If copter has a tendency to gain or lose altitude during the hovering mode, reduce or increase this value.
-
-`MPC_XY_P` – position factor *P* of the ESC. This parameter affects how sharply the copter will react to the position commands. A too high value may cause overshoots.
-
-`MPC_XY_VEL_P` – speed factor *P* of the ESC. This parameter also affects the accuracy and sharpness of copter execution of the given position. A too high value may cause overshoots.
-
-`MPC_XY_VEL_MAX` — the maximum horizontal speed in POSCTL, OFFBOARD, AUTO modes.
-
-`MPC_Z_P`, `MPC_Z_VEL_P` – vertical position and speed factors *P* of the ESCs they determine the copter's ability to maintain the desired altitude.
-
-`MPC_LAND_SPEED` is the vertical velocity of landing in the LAND mode.
-
-## LPE + Q attitude estimator
-
-These parameters configure the behavior of the `lpe` and `q` modules, which compute the state (orientation, position) of the copter. These parameters apply **only** if the `SYS_MC_EST_GROUP` parameter is set to `1` (local_position_estimator, attitude_estimator_q).
-
-## Commander
-
-Prearm checks, switching the modes and states of the copter.
-
-## Sensors
-
-Enabling, disabling and configuring various sensors.

docs/en/power.md

@@ -6,16 +6,15 @@ Open the *Vehicle Setup* tab and select the *Power* menu.
 
 > **Note** Power sensor calibration should be done with the battery pack connected to the drone.
 
-1. In QGroundControl software, go the *Vehicle Setup* panel and choose the *Power* menu.
-2. Set the *Number of cells* parameter according to the number of cells in your battery (*3* for the Clover 4 drone).
-3. Calculate the voltage divider:
+If there is no voltage indicator or manual calibration is not possible, set the average value of the voltage divider for the Clover 4 kit (*Voltage divider* = 11).
+
+1. Set the *Number of cells* parameter according to the number of cells in your battery (*3* for the Clover 4 drone).
+2. Calculate the voltage divider:
     * Measure voltage across the battery (you may use a battery voltage tester for that).
     * Press the *Calculate* button next to the *Voltage divider* label.
     * Put the battery voltage into the prompt and click *Calculate*.
     * Press *Close* to save the calculated value.
 
-If there is no voltage indicator or manual calibration is not possible, set the average value of the voltage divider for the Clover 4 kit (*Voltage divider* = 11).
-
 <img src="../assets/qgc-voltage-divider.png" class="zoom">
 
 Further reading: https://docs.qgroundcontrol.com/en/SetupView/Power.html.
@@ -31,4 +30,6 @@ Further reading: https://docs.qgroundcontrol.com/en/SetupView/Power.html.
 
 <img src="../assets/qgc-power.png" class="zoom">
 
-Further reading: https://docs.px4.io/master/en/advanced_config/esc_calibration.html.
+Further reading: https://docs.px4.io/v1.9.0/en/advanced_config/esc_calibration.html.
+
+**Next**: [Failsafe configuration](failsafe.md)

docs/en/px4_parameters.md

@@ -0,0 +1,72 @@
+# PX4 Parameters
+
+Main article: https://dev.px4.io/en/advanced/parameter_reference.html
+
+> **Note** This is a description some of the most important PX4 parameters as of version 1.8.0. The full list is available at the link above.
+
+To change PX4 parameters, you can use the QGroundControl application [by connecting to Clover via Wi-Fi](gcs_bridge.md):
+
+![PX4 parameters in QGroundControl](../assets/qgc-params.png)
+
+## Main parameters
+
+The most important parameters are listed in this paragraph.
+
+`SYS_MC_EST_GROUP` – select the estimator module.
+
+This is a group of modules that calculates the current state of the copter using readings from the sensors. The copter state includes:
+
+* Angle rate of the copter – pitch_rate, roll_rate, yaw_rate;
+* Copter orientation (in the local coordinate system) – pitch, roll, yaw (one of presentations);
+* Copter position (in the local coordinate system) – x, y, z;
+* Copter speed (in the local coordinate system) – vx, vy, vz;
+* Global coordinates of the copter – latitude, longitude, altitude;
+* Altitude above the surface;
+* Other parameters (the drift of gyroscopes, wind speed, etc.).
+
+`SYS_AUTOCONFIG` — resets all parameters (sets to 1).
+
+## EKF2
+
+`EKF2_AID_MASK` — selects sensors that are used by EKF2 to calculate the copter state.
+
+`EKF2_HGT_MODE` is the main source of height data (z in the local coordinate system):
+
+* 0 – pressure reading on the barometer.
+* 1 – GPS.
+* 2 – distance meter (for example, vl53l1x).
+* 3 – data from VPE.
+
+Variant 2 is the most accurate; however, it is correct to use it only if the surface the copter flies over is flat. Otherwise, the Z axis origin will move up and down with the altitude of the surface.
+
+## Multicopter Position Control
+
+These parameters adjust the flight of the copter by position (POSCTL, OFFBOARD, AUTO modes).
+
+`MPC_THR_HOVER` — hovering throttle. This option is to set to the approximate percentage of throttle needed to make the copter maintain its altitude. If copter has a tendency to gain or lose altitude during the hovering mode, reduce or increase this value.
+
+`MPC_XY_P` – position factor *P* of the ESC. This parameter affects how sharply the copter will react to the position commands. A too high value may cause overshoots.
+
+`MPC_XY_VEL_P` – speed factor *P* of the ESC. This parameter also affects the accuracy and sharpness of copter execution of the given position. A too high value may cause overshoots.
+
+`MPC_XY_VEL_MAX` — the maximum horizontal speed in POSCTL, OFFBOARD, AUTO modes.
+
+`MPC_Z_P`, `MPC_Z_VEL_P` – vertical position and speed factors *P* of the ESCs they determine the copter's ability to maintain the desired altitude.
+
+`MPC_LAND_SPEED` is the vertical velocity of landing in the LAND mode.
+
+## LPE + Q attitude estimator
+
+These parameters configure the behavior of the `lpe` and `q` modules, which compute the state (orientation, position) of the copter. These parameters apply **only** if the `SYS_MC_EST_GROUP` parameter is set to `1` (local_position_estimator, attitude_estimator_q)
+
+TODO
+
+## Commander
+
+Prearm checks, switching the modes and states of the copter.
+
+## Sensors
+
+Enabling, disabling and configuring various sensors.
+
+TODO

docs/en/radio.md

@@ -9,7 +9,7 @@ Before connecting and calibrating the RC, make sure that:
 
 ## Connecting the RC transmitter
 
-1. In QGroundControl software, go the *Vehicle Setup* panel and choose the *Radio* menu.
+1. Open the *Vehicle Setup* tab and select the *Radio* menu.
 2. Power on the transmitter by sliding the **POWER** slider up.
 3. Make sure the transmitter-receiver link is working.
 
@@ -36,3 +36,5 @@ Before connecting and calibrating the RC, make sure that:
 8. When you get the *"All settings have been captured. Click Next to write the new parameters to your board"*, press *Next*.
 
 Further reading: https://docs.qgroundcontrol.com/en/SetupView/Radio.html
+
+**Next**: [Flight modes](modes.md).

docs/en/raspberry.md

@@ -15,3 +15,5 @@ Technical specifications:
 * An HDMI port.
 
 Raspberry Pi is connected to the flight controller in the Clover kit and is used as a companion computer. It can be used to [connect to the drone over Wi-Fi](wifi.md), perform autonomous flights, access peripherals and much more.
+
+**Next**: [Raspberry Pi image](image.md)

docs/en/rc.md

@@ -5,7 +5,7 @@ Controlling Clover from a smartphone
 
 To control Clover from a smartphone via Wi-Fi, you have to install the appropriate application – [iOS](https://itunes.apple.com/ru/app/clever-rc/id1396166572?mt=8), Android (https://play.google.com/store/apps/details?id=express.copter.cleverrc).
 
-![CLEVER RC](../assets/IMG_4397.png)
+![CLEVER RC](../assets/IMG_4397.PNG)
 
 > **Warning** The mobile transmitter is mainly intended for indoor flights to the range not exceeding 10-15 m. Many Wi-Fi networks may also impair responsiveness and the range of the transmitter.
 

docs/en/rc_flysky_a8s.md

@@ -66,9 +66,8 @@ Connect your receiver to the RC IN port on your flight controller:
     <img src="../assets/flysky_a8s/14_coexpix_rcin.png" width=300 class="zoom border center" alt="coex pix connection">
 </div>
 
-Double check that you're using the RC IN port on the COEX Pix:
-
-<img src="../assets/coex_pix/coexpix-bottom.jpg" width=300 class="zoom border center" alt="coex pix pinout">
+> **Hint** Double check that you're using the RC IN port on the COEX Pix:
+<img src="../assets/coexpix-bottom.jpg" width=300 class="zoom border center" alt="coex pix pinout">
 
 ## Binding your transmitter {#rc_bind}
 

docs/en/seeding_drone.md

@@ -115,23 +115,23 @@ After finishing step 4, at section Installing guard of Clover 4.2 assembly.
 
 1. Install the Lower Tank Holders to top Deck mount and fix with the M3x8 screws.
 
-    <img src="../assets/seeding_drone/mechanismpictures/1.png" width="400px" class="center"/>
+    <img src="../assets/seeding_drone/mechanismpictures/1.PNG" width="400px" class="center"/>
 
 2. Install Nylon rack(40 mm) to 4 sides of the Deck mount.
 
-    <img src="../assets/seeding_drone/mechanismpictures/2.png" width="400px" class="center"/>
+    <img src="../assets/seeding_drone/mechanismpictures/2.PNG" width="400px" class="center"/>
 
 3. Install the Grab deck and fix with the M3x8 screws.
 
-    <img src="../assets/seeding_drone/mechanismpictures/3.png" width="400px" class="center"/>
+    <img src="../assets/seeding_drone/mechanismpictures/3.PNG" width="400px" class="center"/>
 
 4. Install the Upper Tank Holders to top Grab mount and fix with the M3x8 screws.
 
-    <img src="../assets/seeding_drone/mechanismpictures/4.png" width="400px" class="center"/>
+    <img src="../assets/seeding_drone/mechanismpictures/4.PNG" width="400px" class="center"/>
 
 5. Connect the Tanks carefully to Tank Holders.
 
-    <img src="../assets/seeding_drone/mechanismpictures/5.png" width="400px" class="center"/>
+    <img src="../assets/seeding_drone/mechanismpictures/5.PNG" width="400px" class="center"/>
 
 6. Connect SG90 servo motors to Tank using zip tie.
 

docs/en/setup.md

@@ -27,29 +27,28 @@ Main article: https://docs.qgroundcontrol.com/en/SetupView/Firmware.html
 
 > **Note** Do not connect your flight controller prior to flashing.
 
-We recommend using the modified version of [PX4 with COEX patches](firmware.md) for the Clover drone, especially for autonomous flights. Download the latest stable version **<a class="latest-firmware v4" href="https://github.com/CopterExpress/Firmware/releases">from our GitHub</a>**.
+We recommend using the modified version of PX4 by CopterExpress for the Clover drone, especially for autonomous flights. Download the latest stable version **<a class="latest-firmware v4" href="https://github.com/CopterExpress/Firmware/releases">from our GitHub</a>**.
 
-To use all the most recent PX4 functions you also can use the latest official firmware version (experimentally).
+> **Info** For Pixhawk-based quadcopters there is a separate firmware version. See details in "[Pixhawk / Pixracer firmware flashing](firmware.md)" article.
 
 Flash the flight controller with this firmware:
 
 <img src="../assets/qgc-firmware.png" alt="QGroundControl firmware upload" class="zoom">
 
-1. Disconnect the flight controller from computer (if connected).
-2. Launch QGroundControl software.
-3. Go to *Vehicle Setup* panel (click on the QGroundControl logo in the top-left corner) and select *Firmware* menu.
+1. Launch QGroundControl software.
+2. Open the *Vehicle Setup* tab.
+3. Select the *Firmware* menu.
 4. Connect your flight controller to your PC over USB.
-5. Select *PX4 Flight Stack* in the right bar appeared.
+5. Wait for the flight controller to connect to QGroundControl.
+6. Select *PX4 Flight Stack* in the right bar.
 
-   <img src="../assets/qgc-firmware.png" alt="QGroundControl firmware upload" class="zoom">
+To use the recommended Copter Express firmware:
 
-6. To use **COEX patched firmware**:
+* Check *Advanced Settings* checkbox.
+* Select *Custom firmware file...* from the dropdown list.
+* Press *OK* and select the file that you've downloaded.
 
-   * Check *Advanced Settings* checkbox.
-   * Select *Custom firmware file...* from the dropdown list.
-   * Press *OK* and select the file that you've downloaded.
-
-   To use the latest **official stable firmware** just press *OK*.
+To use the latest official stable firmware just press *OK*.
 
 Wait for QGroundControl to finish flashing the flight controller.
 
@@ -83,7 +82,7 @@ This is how the main QGroundControl settings window will look like:
 
 ### Setting parameters
 
-Open the *Vehicle Setup* tab and select the *Parameters* menu. You can use the *Search* field to find parameters by name. Recommended parameters values are given in the further documentation and also in the [parameters summary article](parameters.md).
+Open the *Vehicle Setup* tab and select the *Parameters* menu. You can use the *Search* field to find parameters by name.
 
 <img src="../assets/qgc-parameters.png" alt="QGroundControl parameters" class="zoom">
 
@@ -124,3 +123,5 @@ Press the *Save* button to save the changed value to the flight controller. Chan
 
 1. Set `CBRK_USB_CHK` to 197848 to allow flights with the USB cable connected.
 2. Disable safety switch check: `CBRK_IO_SAFETY` = 22027.
+
+**Next**: [Sensor calibration](calibration.md).

docs/en/simple_offboard.md

@@ -1,4 +1,11 @@
-# Autonomous flight
+Autonomous flight (OFFBOARD)
+===
+
+> **Note** In the image version **0.20** `clever` package was renamed to `clover`. See [previous version of the article](https://github.com/CopterExpress/clover/blob/v0.19/docs/en/simple_offboard.md) for older images.
+
+<!-- -->
+
+> **Hint** We recommend using our [custom PX4 firmware for Clover](firmware.md#modified-firmware-for-clover) for autonomous flights.
 
 The `simple_offboard` module of the `clover` package is intended for simplified programming of the autonomous drone flight (`OFFBOARD` [flight mode](modes.md)). It allows setting the desired flight tasks, and automatically transforms [coordinates between frames](frames.md).
 
@@ -6,7 +13,8 @@ The `simple_offboard` module of the `clover` package is intended for simplified
 
 Main services are [`get_telemetry`](#gettelemetry) (receive telemetry data), [`navigate`](#navigate) (fly to a given point along a straight line), [`navigate_global`](#navigateglobal) (fly to a point specified as latitude and longitude along a straight line), [`land`](#land) (switch to landing mode).
 
-## Python usage
+Python examples
+---
 
 You need to create proxies for services before calling them. Use the following template for your programs:
 
@@ -29,7 +37,8 @@ land = rospy.ServiceProxy('land', Trigger)
 
 Unused proxy functions may be removed from the code.
 
-## API description
+API description
+---
 
 > **Note** Omitted numeric parameters are set to 0.
 
@@ -286,7 +295,7 @@ The positive direction of `yaw_rate` rotation (when viewed from the top) is coun
 
 Switch the drone to landing [mode](modes.md) (`AUTO.LAND` or similar).
 
-> **Note** Set the `COM_DISARM_LAND` [PX4 parameter](parameters.md) to a value greater than 0 to enable automatic disarm after landing.
+> **Note** Set the `COM_DISARM_LAND` [PX4 parameter](px4_parameters.md) to a value greater than 0 to enable automatic disarm after landing.
 
 Landing the drone:
 
@@ -303,9 +312,14 @@ Landing the drone (command line):
 rosservice call /land "{}"
 ```
 
-> **Caution** In recent PX4 versions, the vehicle will be switched out of LAND mode to manual mode, if the remote control sticks are moved significantly.
+<!--
+### release
 
-## Additional materials
+Stop publishing setpoints to the drone (release control). Required to continue monitoring by means of [MAVROS](mavros.md).
+-->
+
+Additional materials
+------------------------
 
 * [ArUco-based position estimation and navigation](aruco.md).
 * [Program samples and snippets](snippets.md).

docs/en/simulation_m1.md

@@ -1,56 +0,0 @@
-# Running simulator on M1 powered computer
-
-There is no preconfigured VM image for ARM64 architecture of M1 chip (Apple Silicon), so the only possibility is to install the simulation software manually.
-
-The recommended virtual machine hypervisor is [UTM app](https://mac.getutm.app/). Also it's possible to use **VMware Fusion Public Tech Preview** with M1 support.
-
-## Simulation installation with UTM
-
-<img src="../assets/simulation_utm.png" width=500 class="center zoom">
-
-1. Download UTM App from the official site [mac.getutm.app](https://mac.getutm.app/) and install it.
-2. Download Ubuntu Linux 20.04 installation iso-file for ARM64 architecture using the link: https://cdimage.ubuntu.com/focal/daily-live/current/focal-desktop-arm64.iso.
-3. Create a new virtual machine in UTM, using the following settings:
-
-    * **Type**: Virtualize.
-    * **Operating System**: Linux.
-    * **Boot ISO Image**: choose downloaded file `focal-desktop-arm64.iso`.
-    * **Memory**: 4096 MB or more.
-    * **CPU Cores**: 4 or more.
-    * Turn on *Enable hardware OpenGL acceleration* option.
-    * **Storage**: 20 GB or more.
-
-4. Run the created virtual machine.
-5. Choose *Install Ubuntu* in the menu and install it using the installation master.
-
-    * Recommended apps: *Minimal installation*.
-    * Installation type: *Erase disk and install Ubuntu*.
-    * Input your account parameters, for example:
-
-        <img src="../assets/simulation_ubuntu_account.png" width=400 class="center zoom">
-
-6. Finish the installation and run the system.
-7. Install the simulation using the [native setup manual](simulation_native.md).
-
-### Troubleshooting
-
-#### Black screen
-
-If you see a black screen on your virtual machine, try to run the machine without the GPU support.
-
-In virtual machine settings, choose *Display*, and set *Emulated Display Card* menu to *virtio-ramfb*. Run you machine. If it runs successfully, change the setting back to *virtio-ramfb-gl (GPU Supported)* and run it again.
-
-#### Problem with `git clone`
-
-The following error can occur while performing `git clone`:
-
-```txt
-on git clone if error: RPC failed; curl 56 GnuTLS recv error (-54): Error in the pull function.
-fatal: the remote end hung up unexpectedly
-fatal: early EOF
-fatal: index-pack failed
-```
-
-In this case, change the type of the network card to bridged. In the virtual machine settings, choose *Network*, and set *Network Mode* menu to *Bridged (Advanced)*.
-
-Later, if some network issues occur, change the network mode back to *Shared Network*.

docs/en/simulation_native.md

@@ -144,10 +144,10 @@ sudo systemctl start roscore
 Install any web server to serve Clover's web tools (`~/.ros/www` directory), e. g. Monkey:
 
 ```bash
-wget https://github.com/CopterExpress/clover_vm/raw/master/assets/packages/monkey_1.6.9-1_$(dpkg --print-architecture).deb -P /tmp
-sudo dpkg -i /tmp/monkey_*.deb
+wget https://github.com/CopterExpress/clover_vm/raw/master/assets/packages/monkey_1.6.9-1_amd64.deb -O /tmp/monkey_1.6.9-1_amd64.deb
+sudo apt-get install -y /tmp/monkey_1.6.9-1_amd64.deb
 sed "s/pi/$USER/g" ~/catkin_ws/src/clover/builder/assets/monkey | sudo tee /etc/monkey/sites/default
-sudo sed -i 's/SymLink Off/SymLink On/' /etc/monkey/monkey.conf
+sudo -E sh -c "sed -i 's/SymLink Off/SymLink On/' /etc/monkey/monkey.conf"
 sudo cp ~/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/system/monkey.service
 sudo systemctl enable monkey
 sudo systemctl start monkey

docs/en/simulation_usage.md

@@ -75,7 +75,7 @@ The plugin will collect publishing rate statistics and slow the simulation down
 
 ### Set simulation speed
 
-Since v1.9 the PX4 SITL setup supports [setting the simulation speed](https://docs.px4.io/master/en/simulation/#run-simulation-faster-than-realtime) by setting the `PX4_SIM_SPEED_FACTOR` environment variable. Its value is picked up by PX4 startup scripts, which in turn reconfigure it to expect a certain speedup/slowdown.
+Since v1.9 the PX4 SITL setup supports [setting the simulation speed](https://dev.px4.io/v1.9.0/en/simulation/#simulation_speed) by setting the `PX4_SIM_SPEED_FACTOR` environment variable. Its value is picked up by PX4 startup scripts, which in turn reconfigure it to expect a certain speedup/slowdown.
 
 You should set its value to the actual real time factor that you get with `throttling_camera`. The real time factor may be found in the Gazebo GUI window at the bottom:
 

docs/en/snippets.md

@@ -8,11 +8,13 @@
 
 <a name="block-takeoff"></a><!-- old name of anchor -->
 
-Function to fly to a point and wait for copter's arrival:
+Fly towards a point and wait for copter's arrival:
 
 ```python
 import math
 
+#...
+
 def navigate_wait(x=0, y=0, z=0, yaw=float('nan'), speed=0.5, frame_id='', auto_arm=False, tolerance=0.2):
     navigate(x=x, y=y, z=z, yaw=yaw, speed=speed, frame_id=frame_id, auto_arm=auto_arm)
 
@@ -62,6 +64,8 @@ Wait for copter's arrival to the [navigate](simple_offboard.md#navigate) target:
 ```python
 import math
 
+# ...
+
 def wait_arrival(tolerance=0.2):
     while not rospy.is_shutdown():
         telem = get_telemetry(frame_id='navigate_target')
@@ -75,8 +79,6 @@ def wait_arrival(tolerance=0.2):
 Calculate the distance between two points (**important**: the points are to be in the same [coordinate system](frames.md)):
 
 ```python
-import math
-
 def get_distance(x1, y1, z1, x2, y2, z2):
     return math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2 + (z1 - z2) ** 2)
 ```
@@ -86,8 +88,6 @@ def get_distance(x1, y1, z1, x2, y2, z2):
 Approximation of distance (in meters) between two global coordinates (latitude/longitude):
 
 ```python
-import math
-
 def get_distance_global(lat1, lon1, lat2, lon2):
     return math.hypot(lat1 - lat2, lon1 - lon2) * 1.113195e5
 ```
@@ -203,16 +203,19 @@ from geometry_msgs.msg import PoseStamped, TwistStamped
 from sensor_msgs.msg import BatteryState
 from mavros_msgs.msg import RCIn
 
+# ...
+
 def pose_update(pose):
     # Processing new data of copter's position
     pass
 
+# Other handler functions
+# ...
+
 rospy.Subscriber('/mavros/local_position/pose', PoseStamped, pose_update)
 rospy.Subscriber('/mavros/local_position/velocity', TwistStamped, velocity_update)
 rospy.Subscriber('/mavros/battery', BatteryState, battery_update)
 rospy.Subscriber('mavros/rc/in', RCIn, rc_callback)
-
-rospy.spin()
 ```
 
 Information about MAVROS topics is available at [the link](mavros.md).
@@ -226,13 +229,18 @@ Information about MAVROS topics is available at [the link](mavros.md).
 Send an arbitrary [MAVLink message](mavlink.md) to the copter:
 
 ```python
+# ...
+
 from mavros_msgs.msg import Mavlink
 from mavros import mavlink
 from pymavlink import mavutil
 
+# ...
+
 mavlink_pub = rospy.Publisher('mavlink/to', Mavlink, queue_size=1)
 
 # Sending a HEARTBEAT message:
+
 msg = mavutil.mavlink.MAVLink_heartbeat_message(mavutil.mavlink.MAV_TYPE_GCS, 0, 0, 0, 0, 0)
 msg.pack(mavutil.mavlink.MAVLink('', 2, 1))
 ros_msg = mavlink.convert_to_rosmsg(msg)
@@ -273,6 +281,8 @@ Change the [flight mode](modes.md) to arbitrary one:
 ```python
 from mavros_msgs.srv import SetMode
 
+# ...
+
 set_mode = rospy.ServiceProxy('mavros/set_mode', SetMode)
 
 # ...
@@ -287,6 +297,8 @@ Flip:
 ```python
 import math
 
+# ...
+
 PI_2 = math.pi / 2
 
 def flip():
@@ -325,6 +337,8 @@ from pymavlink import mavutil
 from mavros_msgs.srv import CommandLong
 from mavros_msgs.msg import State
 
+# ...
+
 send_command = rospy.ServiceProxy('/mavros/cmd/command', CommandLong)
 
 def calibrate_gyro():
@@ -358,6 +372,8 @@ Enable and disable [ArUco markers recognition](aruco_marker.md) dynamically (for
 import rospy
 import dynamic_reconfigure.client
 
+# ...
+
 client = dynamic_reconfigure.client.Client('aruco_detect')
 
 # Turn markers recognition off
@@ -376,6 +392,8 @@ Wait for global position to appear (finishing [GPS receiver](gps.md) initializat
 ```python
 import math
 
+# ...
+
 while not rospy.is_shutdown():
     if math.isfinite(get_telemetry().lat):
         break
@@ -390,8 +408,12 @@ Read flight controller's parameter:
 from mavros_msgs.srv import ParamGet
 from mavros_msgs.msg import ParamValue
 
+# ...
+
 param_get = rospy.ServiceProxy('mavros/param/get', ParamGet)
 
+# ...
+
 # Read parameter of type INT
 value = param_get(param_id='COM_FLTMODE1').value.integer
 
@@ -407,8 +429,12 @@ Set flight controller's parameter:
 from mavros_msgs.srv import ParamSet
 from mavros_msgs.msg import ParamValue
 
+# ...
+
 param_set = rospy.ServiceProxy('mavros/param/set', ParamSet)
 
+# ...
+
 # Set parameter of type INT:
 param_set(param_id='COM_FLTMODE1', value=ParamValue(integer=8))
 

docs/en/ssh.md

@@ -25,3 +25,5 @@ Web access
 Starting with version 0.11.4 [of the image](image.md), access to the shell is also available via a web browser (using [Butterfly](https://github.com/paradoxxxzero/butterfly)). To gain access, open web page http://192.168.11.1, and select link *Open web terminal*:
 
 <img src="../assets/butterfly.png">
+
+**Next**: [Command-line interface](cli.md)

docs/en/test_connection.md

@@ -10,7 +10,7 @@ Using a multimeter, check the absence of a short circuit (check the loop):
 * Test the multimeter by shorting the probes. A unit that operated properly makes a distinctive sound.
 * The red probe is connected to the “+ ”pin, the black probe — to the “-” / ”GND” pin. If the circuit is short, a sound is heard.
 
-![Loop check mode](../assets/startPDBtest.jpg)
+![Loop check mode](../../assets/startPDBtest.jpg)
 
 1\. Check OPEN CONDITION of the following circuits (absence of the multimeter sound signal):
 

docs/en/wifi.md

@@ -19,3 +19,5 @@ To edit Wi-Fi settings, or to obtain more detailed information about the network
 After connecting to Clover Wi-Fi, open http://192.168.11.1 in you web browser. It contains all the basic web tools of Clover: viewing image topics, web terminal (Butterfly), and the full copy of this documentation.
 
 <img src="../assets/web.png" alt="Clover Web Interface" class="zoom">
+
+**Next**: [Connecting Raspberry Pi to the flight controller](connection.md).

docs/package.json

@@ -1,14 +0,0 @@
-{
-  "devDependencies": {
-    "@vuepress/plugin-search": "^2.0.0-beta.38",
-    "glob": "^7.2.0",
-    "markdown-it-attrs": "^4.1.3",
-    "vuepress": "^2.0.0-beta.38",
-    "vuepress-plugin-copy-code2": "^2.0.0-beta.36",
-    "vuepress-plugin-sitemap2": "^2.0.0-beta.45"
-  },
-  "scripts": {
-    "dev": "vuepress dev .",
-    "build": "vuepress build ."
-  }
-}

docs/ru/README.md

@@ -1,6 +1,6 @@
 # Клевер
 
-<img class="center zoom big-clover" src="../assets/clover42-main.png" _width="80%" alt="Клевер 4.2">
+<img class="center zoom big-clover" src="../assets/clover42-main.png" width="80%" alt="Клевер 4.2">
 
 **«Клевер»** — это учебный конструктор программируемого квадрокоптера, состоящего из популярных открытых компонентов, а также набор необходимой документации и библиотек для работы с ним.
 

docs/ru/SUMMARY.md

@@ -51,10 +51,9 @@
     * [Сборка на собственной машине](simulation_native.md)
     * [Установка виртуальной машины](simulation_vm.md)
     * [Использование симулятора](simulation_usage.md)
-    * [Установка на компьютеры c M1](simulation_m1.md)
   * [ROS](ros.md)
   * [MAVROS](mavros.md)
-* [Дополнительно](supplementary.md)
+* [Дополнительные материалы](supplementary.md)
   * [COEX Pix](coex_pix.md)
   * [COEX PDB](coex_pdb.md)
   * [COEX GPS](coex_gps.md)
@@ -76,7 +75,7 @@
   * [Пилотирование со смартфона](rc.md)
   * [Настройка сети RPi](network.md)
   * [Интерфейс UART](uart.md)
-  * [Параметры PX4](parameters.md)
+  * [Параметры PX4](px4_parameters.md)
   * [Работа с логами PX4](flight_logs.md)
   * [Прошивка PX4](firmware.md)
   * [Протокол MAVLink](mavlink.md)
@@ -102,7 +101,6 @@
   * [Светодиодная лента (legacy)](leds_old.md)
   * [Вклад в Клевер](contributing.md)
   * [Репозиторий пакетов COEX](packages.md)
-  * [Тестирование Клевера](testing.md)
   * [Переход на версию 0.20](migrate20.md)
   * [Переход на версию 0.22](migrate22.md)
   * [COEX DuoCam](duocam.md)
@@ -117,9 +115,7 @@
   * [CopterHack-2018](copterhack2018.md)
   * [CopterHack-2017](copterhack2017.md)
   * [Конкурс видео](video_contest.md)
-  * [Образовательные конкурсы](educational_contests.md)
-* [Проекты](projects.md)
-  * [Контроль соблюдения ПДД на выделенной полосе с дроном](lane_control.md)
+* [Проекты на базе Клевера](projects.md)
   * [Система автоматической посадки (AMLS)](amls.md)
   * [Разработка системы для управления БПЛА с помощью шлема виртуальной реальности](remote-control-with-oculusvr.md)
   * [Шоу коптеров](clever-show.md)

docs/ru/android.md

@@ -50,7 +50,7 @@ private fun fullScreenCall() {
 
 Вот так выглядит пульт на этом этапе:
 
-<img src="../assets/IMG_4397.png" width="50%">
+<img src="../assets/IMG_4397.PNG" width="50%">
 
 Если вы запустите приложение, то заметите что стики не работают. Это происходит по тому, что на нашей странице отключен *JavaScript*. чтобы его включить надо прописать следующее:
 

docs/ru/aruco_map.md

@@ -93,7 +93,7 @@ rosrun aruco_pose genmap.py 0.33 2 4 1 1 0 -o test_map.txt
 
 ## Настройка VPE
 
-Для работы механизма Vision Position Estimation необходимы следующие [настройки PX4](parameters.md).
+Для работы механизма Vision Position Estimation необходимы следующие [настройки PX4](px4_parameters.md).
 
 При использовании **LPE** (параметр `SYS_MC_EST_GROUP` = `local_position_estimator, attitude_estimator_q`):
 
@@ -154,7 +154,7 @@ navigate(frame_id='aruco_5', x=0, y=0, z=1)
 
 ## Расположение маркеров на потолке
 
-![Маркеры на потолке](../assets/IMG_4175.jpg)
+![Маркеры на потолке](../assets/IMG_4175.JPG)
 
 Для навигации по маркерам, расположенным на потолке, необходимо поставить основную камеру так, чтобы она смотрела вверх и [установить соответствующий фрейм камеры](camera_setup.md#frame).
 

docs/ru/aruco_marker.md

@@ -125,3 +125,7 @@ rospy.spin()
 ```
 
 Сообщения будут содержать ID маркера, его угловые точки на изображении и его позицию (относительно камеры).
+
+---
+
+См. далее: [навигация по картам маркеров](aruco_map.md).

docs/ru/arucogenmap.md

@@ -4,22 +4,22 @@
 
 Начиная с образа версии *0.16* изменился подход к созданию карт маркеров: маркеры больше не привязаны к сетке и каждый из них теперь можно повернуть на любой угол вокруг всех трёх осей. Вместе с этим изменился и способ задания карт маркеров. Теперь карта загружается из текстового файла (подробнее в статье [**Навигация по картам ArUco-маркеров**](aruco_map.md)). Для упрощения процесса создания текстового файла был создан [*конструктор полей*](https://aruco.tenessinum.ru/).
 
-<img alt="" src="../assets/arucogenmap.png"/>
+<img alt="" src="../assets/arucogenmap.PNG"/>
 
 ## Создание поля
 
-<div style="display: flex; flex-direction: row"><img src="../assets/fieldsetup.png" alt=""><div style="padding-left: 20px">Перед началом работы надо задать размеры поля. Оно нужно только для удобства. Для перемещения по "полотну" используйте тачпад или колёсико мыши для перемещения по карте. При использовании мыши зажмите Shift для перемещения в горизонтальном направлении и Ctrl для увеличения/уменьшения поля.</div></div>
+<div style="display: flex; flex-direction: row"><img src="../assets/fieldsetup.PNG" alt=""><div style="padding-left: 20px">Перед началом работы надо задать размеры поля. Оно нужно только для удобства. Для перемещения по "полотну" используйте тачпад или колёсико мыши для перемещения по карте. При использовании мыши зажмите Shift для перемещения в горизонтальном направлении и Ctrl для увеличения/уменьшения поля.</div></div>
 
 ## Инструмент творения
 
 <div style="display: flex; flex-direction: row; justify-content: flex-end;"><div style="padding: 20px">Нажав на плюсик в левом углу экрана откроется меню в котором можно создать какой-либо элемент.
-<ul>
+<ui>
     <li><strong>Одна метка</strong> - просто одинокая метка в поле</li>
     <li><strong>Несколько меток</strong> - группа меток выстроенная в сетку</li>
     <li><strong>Сетка - инструмент</strong> к которому можно привязывать метки</li>
-</ul></div><img src="../assets/tvorec.png"></div>
+</ui></div><img src="../assets/tvorec.PNG"></div>
 
 ## Экспорт
 
 Карту можно экспортировать в двух форматах: ***txt*** (для Клевера) и ***svg*** (для печати)
-<img style="margin: 10px;" src="../assets/expotivka.png" alt=""/>
+<img style="margin: 10px;" src="../assets/expotivka.PNG" alt=""/>

docs/ru/assemble_2.md

@@ -339,7 +339,7 @@
 
 ### Сборка регуляторов
 
-1. Клеим 2х сторонний скотч на основание защитного бокса регуляторов.
+1. Клеим 2х сторонний скотч на основание защитного бокса регуляторов. ![Скотч на бокс регулей](../assets/escCase.png)
 2. Укладываем регуляторы в защитные боксы. Крепим полученную сборку к лучам рамы. ![Вид сверху с боксами для  регулей](../assets/topESCcaseview.png)
 
 ### Установка защиты

docs/ru/assemble_3.md

@@ -36,7 +36,7 @@ TODO
 
     Хвост от хомута (стяжки) отрезать ножницами.
 
-    ![Подготовка моторов](../assets/cl3_prepareMotors.jpg)
+    ![Подготовка моторов](../assets/cl3_prepareMotors.JPG)
 
 ## Монтаж каркасных элементов
 
@@ -45,7 +45,7 @@ TODO
 3. Установить на раму собранную конструкцию, соблюдая схему, винтами М3х16.
 4. Установить каркас для светодиодной ленты, используя прорези в держателях для ножек.
 
-![Монтаж стоек на раму](../assets/cl3_mountElements.jpg)
+![Монтаж стоек на раму](../assets/cl3_mountElements.JPG)
 
 ## Монтаж преобразователя напряжения BEC (припаять и проверить)
 
@@ -93,7 +93,7 @@ TODO
             Черный ->  GND
             Синий -> Din
 
-![Монтаж преобразователя напряжения BEC ](../assets/cl3_mountBEC.jpg)
+![Монтаж преобразователя напряжения BEC ](../assets/cl3_mountBEC.JPG)
 
 ## Монтаж регуляторов
 
@@ -131,7 +131,7 @@ TODO
 3. Установить плату распределения питания PDB, как показано на картинке (разъем XT60 направлен к хвосту коптера).
 4. Соединить разъемы питания платы питания и платы регуляторов XT30.
 
- ![Монтаж платы питания](../assets/cl3_mountESC.jpg)
+ ![Монтаж платы питания](../assets/cl3_mountESC.JPG)
 
 ## Сопряжение приемника и пульта
 
@@ -148,7 +148,7 @@ TODO
     * Убрать BIND разъем из приемника.
     * Отключить АКБ.
 
-![Сопряжение приемника и пульта](../assets/cl3_bindFlysky.jpg)
+![Сопряжение приемника и пульта](../assets/cl3_bindFlysky.JPG)
 
 > **Hint** Если пульт не включается или заблокирован, см.
 статью [неисправности пульта](radioerrors.md).
@@ -168,7 +168,7 @@ TODO
 4. Проверить направления вращения мотора по схеме.Повторить для каждого мотора. Таким образом, будет понятно каким именно мотором мы управляем.
 5. Если необходимо изменить направление вращения, то меняем любые два фазных провода мотора (нужно переподключить).
 
-![Проверка направления вращения моторов](../assets/cl3_testMotorsFlysky.jpg)
+![Проверка направления вращения моторов](../assets/cl3_testMotorsFlysky.JPG)
 
 ## Монтаж и подключение полетного контроллера Pixracer
 
@@ -185,7 +185,7 @@ TODO
 
 4. Подключить шлейф радиоприемника в разъем RCIN в Pixracer.
 
-![Монтаж полетного контроллера](../assets/cl3_mountPixracer.jpg)
+![Монтаж полетного контроллера](../assets/cl3_mountPixracer.JPG)
 
 ## Монтаж Raspberry
 
@@ -209,7 +209,7 @@ TODO
 
     Используйте винт М3х16 и гайку М3
 
-![Монтаж Raspberry Pi Model B](../assets/cl3_mountRaspberryPi.jpg)
+![Монтаж Raspberry Pi Model B](../assets/cl3_mountRaspberryPi.JPG)
 
 ## Монтаж Arduino и радиоприемника FlySky
 
@@ -223,7 +223,7 @@ TODO
         черный -> GND
         оранжевый, зеленый -> не используются. Выньте эти провода из разъёма или обрежьте их.
 
-![Монтаж Arduino nano и радиоприемника Flysky i6](../assets/cl3_mountArduinoandFlysky.jpg)
+![Монтаж Arduino nano и радиоприемника Flysky i6](../assets/cl3_mountArduinoandFlysky.JPG)
 
 ## Монтаж камеры RPi
 
@@ -236,7 +236,7 @@ TODO
 
 5. Установить ножки в маунты (4 шт.).
 
-![Монтаж камеры RPi](../assets/cl3_mountRpiCamera.jpg)
+![Монтаж камеры RPi](../assets/cl3_mountRpiCamera.JPG)
 
 ## Монтаж остальных конструктивных элементов
 
@@ -246,13 +246,13 @@ TODO
 
     Закрепить верхнюю деку винтами М3х8 (4 шт.)
 
-![Монтаж остальных конструктивных элементов](../assets/cl3_mountOtherElements.jpg)
+![Монтаж остальных конструктивных элементов](../assets/cl3_mountOtherElements.JPG)
 
 ## Монтаж USB соединителей
 
 1. Соедините Pixracer и Raspberry, используя micro USB - USB кабель.
 2. Соедините Arduino и Raspberry, используя micro USB - USB кабель.
 
-![Монтаж USB соединителей](../assets/cl3_mountUSBconnectors.jpg).
+![Монтаж USB соединителей](../assets/cl3_mountUSBconnectors.JPG).
 
 Подробнее про подключение см. [статью](connection.md).

docs/ru/autolaunch.md

@@ -6,7 +6,7 @@
 systemd
 ---
 
-Основная документация: https://wiki.archlinux.org/index.php/Systemd_(Русский).
+Основная документация: [https://wiki.archlinux.org/index.php/Systemd_(Русский)](https://wiki.archlinux.org/index.php/Systemd_(Русский)).
 
 Все автоматически стартуемое ПО Клевера запускается в виде systemd-сервиса `clover.service`.
 
@@ -22,7 +22,7 @@ sudo systemctl restart clover
 journalctl -u clover
 ```
 
-Для того чтобы запустить ПО Клевера непосредственно в текущей консольной сессии, вы можете использовать `roslaunch`:
+Для того, запустить ПО Клевера непосредственно в текущей консольной сессии, вы можете использовать `roslaunch`:
 
 ```bash
 sudo systemctl stop clover
@@ -54,8 +54,8 @@ roslaunch
 chmod +x my_program.py
 ```
 
-При использовании скриптовых языков вначале файла должен стоять <a href="https://ru.wikipedia.org/wiki/Шебанг_(Unix)">shebang</a>, например:
+При использовании скриптовых языков вначале файла должен стоять [shebang](https://ru.wikipedia.org/wiki/Шебанг_(Unix)), например:
 
 ```bash
-#!/usr/bin/env python3
+#!/usr/bin/env python
 ```

docs/ru/blocks.md

@@ -49,7 +49,7 @@
 
 ### take_off
 
-<img src="../assets/blocks/take-off.png" srcset="@source/assets/blocks/take-off.png 2x">
+<img src="../assets/blocks/take-off.png" srcset="../assets/blocks/take-off.png 2x">
 
 Взлететь на указанную высоту в метрах. Высота может быть произвольным блоком, возвращающим числовое значение.
 
@@ -57,7 +57,7 @@
 
 ### navigate
 
-<img src="../assets/blocks/navigate.png" srcset="@source/assets/blocks/navigate.png 2x">
+<img src="../assets/blocks/navigate.png" srcset="../assets/blocks/navigate.png 2x">
 
 Прилететь в заданную точку. Координаты точки задаются в метрах.
 
@@ -76,7 +76,7 @@
 
 ### land
 
-<img src="../assets/blocks/land.png" srcset="@source/assets/blocks/land.png 2x">
+<img src="../assets/blocks/land.png" srcset="../assets/blocks/land.png 2x">
 
 Произвести посадку.
 
@@ -84,31 +84,31 @@
 
 ### wait
 
-<img src="../assets/blocks/wait.png" srcset="@source/assets/blocks/wait.png 2x">
+<img src="../assets/blocks/wait.png" srcset="../assets/blocks/wait.png 2x">
 
 Ожидать заданное время в секундах. Время ожидания может быть произвольным блоком, возвращающим числовое значение.
 
 ### wait_arrival
 
-<img src="../assets/blocks/wait-arrival.png" srcset="@source/assets/blocks/wait-arrival.png 2x">
+<img src="../assets/blocks/wait-arrival.png" srcset="../assets/blocks/wait-arrival.png 2x">
 
 Ожидать, пока дрон долетит до целевой точки (заданной в [navigate](#navigate)-блоке).
 
 ### get_position
 
-<img src="../assets/blocks/get-position.png" srcset="@source/assets/blocks/get-position.png 2x">
+<img src="../assets/blocks/get-position.png" srcset="../assets/blocks/get-position.png 2x">
 
 Блок позволяет получить позицию, скорость и угол по рысканью дрона в заданной [системе координат](#relative_to).
 
 ### set_effect
 
-<img src="../assets/blocks/set-effect.png" srcset="@source/assets/blocks/set-effect.png 2x">
+<img src="../assets/blocks/set-effect.png" srcset="../assets/blocks/set-effect.png 2x">
 
 Блок позволяет устанавливать различные анимации на LED-ленту аналогично [ROS-сервису `set_effect`](leds.md#set_effect).
 
 Пример использования блока для установки случайного цвета (блоки, связанные с цветами находятся в категории *Colour*):
 
-<img src="../assets/blocks/random-color.png" srcset="@source/assets/blocks/random-color.png 2x">
+<img src="../assets/blocks/random-color.png" srcset="../assets/blocks/random-color.png 2x">
 
 ### Работа с GPIO {#GPIO}
 

docs/ru/calibration.md

@@ -53,3 +53,5 @@
 5. Дождитесь окончания калибровки.
 
 Дополнительная информация: https://docs.px4.io/master/en/config/level_horizon_calibration.html.
+
+**Далее**: [Настройка пульта](radio.md).